Improve reload stability

Fernthedev · Aug 19, 2024 · c83d671 · c83d671
1 parent 3ff418b
commit c83d671
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/actions/UserCSProjAction.kt b/src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/actions/UserCSProjAction.kt
@@ -25,6 +25,7 @@ class UserCSProjAction : BeatSaberProjectAction() {
             withBackgroundProgress(project,"Create user.csproj" ) {
                 beatSaberProjectManager.locateFoldersAndGenerate(WorkspaceModel.getInstance(project).findProjects(), true)
             }
+
         }
     }
 

diff --git a/src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/helpers/ProjectUtils.kt b/src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/helpers/ProjectUtils.kt
@@ -67,6 +67,7 @@ class ProjectUtils(
 //        }
         ProjectModelViewUpdaterAsync.getInstance(project).requestUpdatePresentation()
 
+
         val projectIds = projects.mapNotNull { it.getId(project) }
 
 
@@ -91,13 +92,14 @@ class ProjectUtils(
 
 //        ReloadProjectAction.execute() is the original code
 
-        yieldThroughInvokeLater()
+        while (project.solution.isLoading.valueOrNull == true) {
+            yieldThroughInvokeLater()
+        }
 
         withContext(Dispatchers.EDT) {
             // We do the same here sadly
             val command2 =
-                ReloadCommand(projectIds.toList(), withDependencies = true, onlyUnloaded = false);
-
+                ReloadCommand(projectIds.toList(), withDependencies = false, onlyUnloaded = false);
 
             project.solution.projectModelTasks.reloadProjects.runUnderProgress(
                 command2,
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ class UserCSProjAction : BeatSaberProjectAction() { @@
                 withBackgroundProgress(project,"Create user.csproj" ) {
                     beatSaberProjectManager.locateFoldersAndGenerate(WorkspaceModel.getInstance(project).findProjects(), true)
                 }
             }
         }
@@ Expand Down @@