Merge pull request #177 from jwallet/jwallet

fix series crash
MLBAMGames · Apr 12, 2018 · 5fc8efd · 5fc8efd
2 parents 8171915 + e416c78
commit 5fc8efd
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 62 deletions.
diff --git a/NHLGames/Controls/GameControl.vb b/NHLGames/Controls/GameControl.vb
@@ -74,10 +74,6 @@ Namespace Controls
                                                        NHLGamesMetro.RmText.GetString($"enum{_game.GameState.ToString().ToLower()}").ToUpper())
                 End If
 
-                If (Not showLiveScores OrElse Not showSeriesRecord) And _game.GameType.Equals(GameTypeEnum.Series) Then
-                    lblNotInSeason.Text = NHLGamesMetro.RmText.GetString("lblPlayoffs").ToUpper()
-                End If
-
             ElseIf _game.IsOffTheAir Then
                 lblHomeScore.Visible = showScores
                 lblAwayScore.Visible = showScores

diff --git a/NHLGames/English.Designer.vb → NHLGames/English1.Designer.vb b/NHLGames/English.Designer.vb → NHLGames/English1.Designer.vb
diff --git a/NHLGames/French.resx b/NHLGames/French.resx
@@ -153,14 +153,6 @@
     <value>Caméra zone {0}</value>
     <comment>Game panel</comment>
   </data>
-  <data name="cbEnglish" xml:space="preserve">
-    <value>English</value>
-    <comment>Settings tab</comment>
-  </data>
-  <data name="cbFrench" xml:space="preserve">
-    <value>Français</value>
-    <comment>Settings tab</comment>
-  </data>
   <data name="lblFrenchNetwork" xml:space="preserve">
     <value>Stream canadien français</value>
     <comment>Game panel</comment>
@@ -693,18 +685,6 @@
     <value>Heure</value>
     <comment>Set record panel</comment>
   </data>
-  <data name="cbLiveReplayFeedStart" xml:space="preserve">
-    <value>Au tout début du stream</value>
-    <comment>Settings tab</comment>
-  </data>
-  <data name="cbLiveReplayGameTime" xml:space="preserve">
-    <value>Quand l'évènement débute (heure du match)</value>
-    <comment>Settings tab</comment>
-  </data>
-  <data name="cbLiveReplayPuckDrop" xml:space="preserve">
-    <value>Quand le match commence (puck en jeu)</value>
-    <comment>Settings tab</comment>
-  </data>
   <data name="lblLiveReplay" xml:space="preserve">
     <value>Rejoue en direct</value>
     <comment>Settings tab</comment>
@@ -717,4 +697,24 @@
     <value>Temps restant en direct</value>
     <comment>Game panel</comment>
   </data>
+  <data name="cbEnglish" xml:space="preserve">
+    <value>English</value>
+    <comment>Settings tab</comment>
+  </data>
+  <data name="cbFrench" xml:space="preserve">
+    <value>Français</value>
+    <comment>Settings tab</comment>
+  </data>
+  <data name="cbLiveReplayFeedStart" xml:space="preserve">
+    <value>Au tout début du stream</value>
+    <comment>Settings tab</comment>
+  </data>
+  <data name="cbLiveReplayGameTime" xml:space="preserve">
+    <value>Quand l'évènement débute (heure du match)</value>
+    <comment>Settings tab</comment>
+  </data>
+  <data name="cbLiveReplayPuckDrop" xml:space="preserve">
+    <value>Quand le match commence (puck en jeu)</value>
+    <comment>Settings tab</comment>
+  </data>
 </root>
diff --git a/NHLGames/NHLGames.vbproj b/NHLGames/NHLGames.vbproj
@@ -199,7 +199,7 @@
     <Compile Include="Controls\OneRecordControl.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="English.Designer.vb">
+    <Compile Include="English1.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>English.resx</DependentUpon>

diff --git a/NHLGames/Utilities/GameFetcher.vb b/NHLGames/Utilities/GameFetcher.vb
@@ -101,7 +101,7 @@ Namespace Utilities
         Private Shared Function SortGames(games As Game()) As List(Of Game)
             If NHLGamesMetro.TodayLiveGamesFirst Then
                 Return games.OrderBy (Of Boolean)(Function(val) val.IsUnplayable).
-                    ThenBy (Of Boolean)(Function(val) val.IsFinal).
+                    ThenBy (Of Boolean)(Function(val) val.IsOffTheAir).
                     ThenBy (Of Long)(Function(val) val.GameDate.Ticks).ToList()
             Else
                 Return games.OrderBy (Of Boolean)(Function(val) val.IsUnplayable).

diff --git a/NHLGames/res/AssemblyInfo.vb b/NHLGames/res/AssemblyInfo.vb
@@ -31,6 +31,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.2.0.0")>
-<Assembly: AssemblyFileVersion("1.2.0.0")>
+<Assembly: AssemblyVersion("1.2.0.1")>
+<Assembly: AssemblyFileVersion("1.2.0.1")>
 <Assembly: NeutralResourcesLanguage("en-CA")>