Merged 'ISSUE-31' into 'dev'.

DalveenLeandor · Jul 6, 2018 · 5594822 · 5594822
2 parents 5095363 + d71b30a
commit 5594822
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/ParallelRoadTool/ModInfo.cs b/ParallelRoadTool/ModInfo.cs
@@ -7,7 +7,7 @@ namespace ParallelRoadTool
 {
     public class ModInfo : IUserMod
     {
-        public const string Version = "0.17.0";
+        public const string Version = "0.19.0";
         public const string Branch = "dev";
 
         public ModInfo()

diff --git a/ParallelRoadTool/ParallelRoadTool.cs b/ParallelRoadTool/ParallelRoadTool.cs
@@ -29,7 +29,7 @@ public class ParallelRoadTool : MonoBehaviour
         private bool _isToolActive;
         public bool IsToolActive
         {
-            get => _isToolActive && NetTool.enabled;
+            get => _isToolActive && NetTool != null && NetTool.enabled;
 
             private set
             {
@@ -168,18 +168,24 @@ public void Start()
 
         public void OnDestroy()
         {
-            DebugUtils.Log("Destroying ...");
-
-            UnsubscribeToUIEvents();                                   
-            AvailableRoadTypes.Clear();
-            SelectedRoadTypes.Clear();            
-            IsToolActive = false;
-            IsSnappingEnabled = false;
-            IsLeftHandTraffic = false;
-            _mainWindow.OnDestroy();
-            _mainWindow = null;
-
-            NetManagerDetour.Revert();
+            try
+            {
+                DebugUtils.Log("Destroying ...");
+
+                NetManagerDetour.Revert();
+
+                UnsubscribeToUIEvents();
+                AvailableRoadTypes.Clear();
+                SelectedRoadTypes.Clear();
+                IsToolActive = false;
+                IsSnappingEnabled = false;
+                IsLeftHandTraffic = false;
+                _mainWindow.OnDestroy();
+                _mainWindow = null;
+            }
+            catch {
+                // HACK - [ISSUE 31]
+            }
         }
 
         public void OnGUI()

diff --git a/ParallelRoadTool/UI/UIMainWindow.cs b/ParallelRoadTool/UI/UIMainWindow.cs
@@ -199,8 +199,14 @@ public override void Update()
 
         public override void OnDestroy()
         {
-            UnsubscribeToUIEvents();
-            base.OnDestroy();
+            try
+            {
+                UnsubscribeToUIEvents();
+                base.OnDestroy();
+            }
+            catch {
+                // HACK - [ISSUE-31]
+            }
         }
 
         protected override void OnPositionChanged()