Merge pull request #9 from linuxgurugamer/linuxgurugamer-patch-1

Fix Nullrefs which occur when using KRASH

Author: linuxgurugamer

ClickThroughBlocker/ClickThroughBlocker.cs

@@ -62,7 +62,7 @@ internal void PreventEditorClickthrough(Rect r)
 #if DUMMY
                 return;
 #else
-                if (lockName == null)
+                if (lockName == null || EditorLogic.fetch == null)
                     return;
                 //Log.Info("ClickThruBlocker: PreventEditorClickthrough");
                 bool mouseOverWindow = MouseIsOverWindow(r);
@@ -129,7 +129,7 @@ internal void OnDestroy()
                     else
                         InputLockManager.RemoveControlLock(lockName);
                 }
-                if (weLockedEditorInputs)
+                if (EditorLogic.fetch != null && weLockedEditorInputs)
                 {
                     //EditorLogic.fetch.Unlock(lockName);
                     weLockedEditorInputs = false;
@@ -475,7 +475,7 @@ private void DoGuiCounter()
                 {
                     //Log.Info("lastonGuiCnt: " + lastonGuiCnt + "lastLockCycle: " + win.lastLockCycle);
                     {
-                        if (win.weLockedEditorInputs)
+                        if (if (EditorLogic.fetch != null && win.weLockedEditorInputs)
                         {
                             EditorLogic.fetch.Unlock(win.lockName);
                             win.weLockedEditorInputs = false;
@@ -493,4 +493,4 @@ private void DoGuiCounter()
         }
     }
 #endif
-}
+}