Fixed nullref during game startup

linuxgurugamer · linuxgurugamer · commit 6323f94e45c1 · 2018-01-15T21:16:36.000-05:00
diff --git a/.vs/ToolbarControl/v15/sqlite3/storage.ide b/.vs/ToolbarControl/v15/sqlite3/storage.ide
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,6 @@
+0.1.3
+	Fixed nullref during game startup
+
 0.1.2
 	Fixed issue with stock toolbar not changing textures
 	Replaced Debug.Log with logging class to reduce log spam
diff --git a/GameData/000_Toolbar/ToolbarControl.version b/GameData/000_Toolbar/ToolbarControl.version
@@ -11,7 +11,7 @@
     {
         "MAJOR" : 0,
         "MINOR" : 1,
-        "PATCH" : 2,
+        "PATCH" : 3,
         "BUILD" : 0
     }
 }
diff --git a/ToolbarControl.version b/ToolbarControl.version
@@ -11,7 +11,7 @@
     {
         "MAJOR" : 0,
         "MINOR" : 1,
-        "PATCH" : 2,
+        "PATCH" : 3,
         "BUILD" : 0
     }
 }
diff --git a/ToolbarControl/AssemblyVersion.cs b/ToolbarControl/AssemblyVersion.cs
@@ -5,4 +5,4 @@
   
  using System.Reflection;
 
- [assembly: AssemblyVersion("0.1.2.0")]
+ [assembly: AssemblyVersion("0.1.3.0")]
diff --git a/ToolbarControl/ToolbarControl.cs b/ToolbarControl/ToolbarControl.cs
@@ -79,13 +79,17 @@ private void SetIsEnabled(bool b)
             isEnabled = b;
             if (activeToolbarType == ToolBarSelected.stock)
             {
+                if (this.stockButton == null)
+                    return;
                 if (b)
                     this.stockButton.Enable();
                 else
                     this.stockButton.Disable();
             }
             if (activeToolbarType == ToolBarSelected.blizzy)
             {
+                if (blizzyButton == null)
+                    return;
                 this.blizzyButton.Enabled = b;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`{`
`12`	`12`	`"MAJOR" : 0,`
`13`	`13`	`"MINOR" : 1,`
`14`		`- "PATCH" : 2,`
	`14`	`+ "PATCH" : 3,`
`15`	`15`	`"BUILD" : 0`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@`
`5`	`5`
`6`	`6`	`using System.Reflection;`
`7`	`7`
`8`		`- [assembly: AssemblyVersion("0.1.2.0")]`
	`8`	`+ [assembly: AssemblyVersion("0.1.3.0")]`
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,17 @@ private void SetIsEnabled(bool b)`
`79`	`79`	`isEnabled = b;`
`80`	`80`	`if (activeToolbarType == ToolBarSelected.stock)`
`81`	`81`	`{`
	`82`	`+ if (this.stockButton == null)`
	`83`	`+ return;`
`82`	`84`	`if (b)`
`83`	`85`	`this.stockButton.Enable();`
`84`	`86`	`else`
`85`	`87`	`this.stockButton.Disable();`
`86`	`88`	`}`
`87`	`89`	`if (activeToolbarType == ToolBarSelected.blizzy)`
`88`	`90`	`{`
	`91`	`+ if (blizzyButton == null)`
	`92`	`+ return;`
`89`	`93`	`this.blizzyButton.Enabled = b;`
`90`	`94`	`}`
`91`	`95`	`}`