diff --git a/NHLGames/Controls/GameControl.vb b/NHLGames/Controls/GameControl.vb index 3176585..8e18af2 100644 --- a/NHLGames/Controls/GameControl.vb +++ b/NHLGames/Controls/GameControl.vb @@ -164,7 +164,7 @@ Namespace Controls Replace("wins", NHLGamesMetro.RmText.GetString("gameSeriesWin")). Replace("leads", NHLGamesMetro.RmText.GetString("gameSeriesLead"))). ToUpper(), seriesStatusShort) - Dim isSeriesRecordVisible = showSeriesRecord AndAlso _game.SeriesGameStatus.Length > 0 AndAlso (showScores OrElse Not _game.IsOffTheAir) + Dim isSeriesRecordVisible = showSeriesRecord AndAlso _game.SeriesGameStatus.Length > 0 AndAlso (showScores OrElse (_game.GameState < GameStateEnum.OffTheAir)) lblNotInSeason.Text = If(isSeriesRecordVisible, seriesStatusLong, seriesStatusShort) End If @@ -378,7 +378,7 @@ Namespace Controls End Sub Private Function WatchArgs() As GameWatchArguments - Return ApplicationSettings.Read(Of GameWatchArguments)(SettingsEnum.DefaultWatchArgs, New GameWatchArguments) + Return ApplicationSettings.Read(Of GameWatchArguments)(SettingsEnum.DefaultWatchArgs, NHLGamesMetro.watchArgs) End Function Private Sub WatchStream(streamType As StreamerTypeEnum) diff --git a/NHLGames/NHLGamesMetro.vb b/NHLGames/NHLGamesMetro.vb index 95910bc..795585f 100644 --- a/NHLGames/NHLGamesMetro.vb +++ b/NHLGames/NHLGamesMetro.vb @@ -41,6 +41,7 @@ Public Class NHLGamesMetro Public Shared IsServerUp As Boolean = Nothing Public IsProxyListening As Task(Of Boolean) = Nothing Public Shared IsHostsRedirectionSet As Boolean = False + Public Shared WatchArgs As GameWatchArguments = New GameWatchArguments Public Shared Sub Main() diff --git a/NHLGames/Utilities/Common.vb b/NHLGames/Utilities/Common.vb index 7f7c047..2f88aa2 100644 --- a/NHLGames/Utilities/Common.vb +++ b/NHLGames/Utilities/Common.vb @@ -122,7 +122,8 @@ Namespace Utilities Await GitHub.GetVersion() Await GitHub.GetAccouncement() - NHLGamesMetro.IsServerUp = Await SendWebRequestAsync($"http://{NHLGamesMetro.HostName}") + Dim hostName As String = NHLGamesMetro.HostName + NHLGamesMetro.IsServerUp = If(Not hostName.Equals(String.Empty), Await SendWebRequestAsync($"http://{hostName}"), False) If Not errorMessage.Equals(String.Empty) Then FatalError(NHLGamesMetro.RmText.GetString(errorMessage)) diff --git a/NHLGames/Utilities/InitializeForm.vb b/NHLGames/Utilities/InitializeForm.vb index 71dadd4..5534af7 100644 --- a/NHLGames/Utilities/InitializeForm.vb +++ b/NHLGames/Utilities/InitializeForm.vb @@ -181,7 +181,7 @@ Namespace Utilities PopulateComboBox(Form.cbServers, SettingsEnum.SelectedServer, SettingsEnum.ServerList, String.Empty) Common.SetRedirectionServerInApp() - watchArgs = BindWatchArgsToForm(watchArgs) + NHLGamesMetro.WatchArgs = BindWatchArgsToForm(watchArgs) Dim adDetectionConfigs = ApplicationSettings.Read(Of AdDetectionConfigs)(SettingsEnum.AdDetection, Nothing) diff --git a/NHLGames/Utilities/Proxy.vb b/NHLGames/Utilities/Proxy.vb index e4d35f6..200e88e 100644 --- a/NHLGames/Utilities/Proxy.vb +++ b/NHLGames/Utilities/Proxy.vb @@ -103,7 +103,7 @@ Namespace Utilities End Function Private Sub SetPath() - _pathToProxy = $"{_folderPath}\{If(Environment.Is64BitOperatingSystem, "win64", "win86")}\{_exeName}" + _pathToProxy = $"{_folderPath}\{_exeName}" End Sub Public Function IsProxyFileFound() As Boolean diff --git a/NHLGames/res/AssemblyInfo.vb b/NHLGames/res/AssemblyInfo.vb index 305d67f..743d6e6 100644 --- a/NHLGames/res/AssemblyInfo.vb +++ b/NHLGames/res/AssemblyInfo.vb @@ -31,6 +31,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + +