Merge pull request #66 from Meivyn/fix/null-ref

Fix exception on exit
rithik-b · Nov 17, 2023 · a9e6b21 · a9e6b21
2 parents 4545bff + 9795a64
commit a9e6b21
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/PlaylistManager/UI/ViewControllers/FoldersViewController.cs b/PlaylistManager/UI/ViewControllers/FoldersViewController.cs
@@ -291,7 +291,11 @@ private void CreateFolder()
 
         private void CreateKeyboardEnter(string folderName)
         {
-            if (CurrentParentManager == null) return;
+            if (CurrentParentManager == null)
+            {
+                return;
+            }
+
             folderName = folderName.Replace("/", "").Replace("\\", "").Replace(".", "");
             if (!string.IsNullOrEmpty(folderName))
             {
@@ -324,7 +328,11 @@ private void RenameButtonClicked()
 
         private void RenameKeyboardEnter(string folderName)
         {
-            if (CurrentParentManager?.Parent == null) return;
+            if (CurrentParentManager?.Parent == null)
+            {
+                return;
+            }
+
             folderName = folderName.Replace("/", "").Replace("\\", "").Replace(".", "");
             if (!string.IsNullOrEmpty(folderName))
             {
@@ -356,6 +364,11 @@ private void DeleteConfirm()
 
         public void LevelCategoryUpdated(SelectLevelCategoryViewController.LevelCategory levelCategory, bool viewControllerActivated)
         {
+            if (rootTransform == null)
+            {
+                return;
+            }
+
             if (levelCategory == SelectLevelCategoryViewController.LevelCategory.CustomSongs)
             {
                 rootTransform.gameObject.SetActive(true);