Bug fixes

Author: luke161

Scripts/Editor/UViewWindow.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEditor;
 using System.Collections;
@@ -89,8 +89,10 @@ protected void OnGUI()
 						for(; i<l; ++i) names[i] = controllers[i].gameObject.name;
 
 						int index = System.Array.IndexOf<ViewController>(controllers,_viewController);
+						if(index<0) index = 0;
+
 						index = EditorGUILayout.Popup("View Controller",index,names);
-						controller = controllers[index];
+						controller = index>=0 && index<controllers.Length ? controllers[index] : null;
 					}
 
 					if(controller!=_viewController){
@@ -99,7 +101,7 @@ protected void OnGUI()
 						_viewController = controller;
 					}
 
-					_viewControllerEditor.OnInspectorGUI();
+					if(_viewControllerEditor!=null) _viewControllerEditor.OnInspectorGUI();
 
 				} else {
 
@@ -188,4 +190,4 @@ private void DrawSettingsGUI()
 
 	}
 
-}
+}

Scripts/Editor/ViewControllerEditor.cs

@@ -67,6 +67,7 @@ public override void OnInspectorGUI ()
 		private void DrawStatsGUI()
 		{
 			ViewController viewController = target as ViewController;
+			if(viewController==null || viewController.currentLocation==null) return;
 
 			UViewEditorUtils.LayoutLabelWithPrefix("Loaded Resources",viewController.loadedResourceCount);
 

Scripts/Editor/ViewList.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using UnityEditorInternal;
 using System.Collections;
@@ -119,4 +119,4 @@ private void OnSelectedCallback(ReorderableList list)
 
 	}
 
-}
+}

Scripts/ViewController.cs

@@ -141,7 +141,7 @@ public AbstractView[] showingOverlays {
 		public int loadedResourceCount {
 			get { 
 				int count = 0;
-				foreach(ViewAsset asset in _assetLookup.Values) if(asset.IsResourceLoaded) count++;
+				if(_assetLookup!=null) foreach(ViewAsset asset in _assetLookup.Values) if(asset.IsResourceLoaded) count++;
 
 				return count; 
 			}