Fix isEditing bool to fix packing/repacking other prefabs

neilsarkar · Feb 22, 2021 · 624378e · 624378e
1 parent 96f52b6
commit 624378e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Runtime/Navigation/VioletScreen.cs b/Runtime/Navigation/VioletScreen.cs
@@ -110,11 +110,13 @@ public void Update() {
 
 		[SerializeField, HideInInspector]
 		string prefabPath = "";
-		UnityEngine.Object prefab;
+		[SerializeField, HideInInspector]
 		public bool isEditing;
+		UnityEngine.Object prefab;
+
 		public void PackPrefab() {
 			var path = string.IsNullOrEmpty(prefabPath) ? $"Assets/Menus/{name}.prefab" : prefabPath;
-			isEditing = true;
+			isEditing = false;
 			PrefabUtility.SaveAsPrefabAssetAndConnect(gameObject, path, InteractionMode.AutomatedAction);
 		}
 
@@ -150,6 +152,7 @@ public void UnpackPrefab() {
 			prefabPath = PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(gameObject);
 			Violet.LogVerbose($"prefabPath is {prefabPath} for {name}");
 			PrefabUtility.UnpackPrefabInstance(gameObject, PrefabUnpackMode.OutermostRoot, InteractionMode.AutomatedAction);
+			isEditing = true;
 		}
 
 		void EditorSceneManager_sceneSaved(Scene scene) {

diff --git a/Runtime/Views/View.cs b/Runtime/Views/View.cs
@@ -111,7 +111,7 @@ void RenderWrapper(TState state, TState lastState) {
 #else
 			try {
 				RenderInternal(state, lastState);
-			} catch(Bail e) {
+			} catch(Bail) {
 			} catch(Exception e) {
 				UnityEngine.Debug.LogException(e);
 			}