fix: prevent endless install loop

readyplayerme · Nov 17, 2023 · 5a86ed8 · 5a86ed8
1 parent daed48e
commit 5a86ed8
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/Editor/Module Management/ModuleInstaller.cs b/Editor/Module Management/ModuleInstaller.cs
@@ -35,17 +35,15 @@ public static class ModuleInstaller
 
         static ModuleInstaller()
         {
+
             Events.registeringPackages -= OnRegisteringPackages;
             Events.registeringPackages += OnRegisteringPackages;
-# if RPM_DEVELOPMENT
-            modulesInstalled = true;
+
+#if !READY_PLAYER_ME
+            InstallModules();
+            EditorApplication.delayCall += DelayCreateCoreSettings;
+            DefineSymbolHelper.AddSymbols();
 #endif
-            if (!modulesInstalled)
-            {
-                InstallModules();
-                EditorApplication.delayCall += DelayCreateCoreSettings;
-                DefineSymbolHelper.AddSymbols();
-            }
         }
 
         /// <summary>
@@ -66,6 +64,7 @@ private static void DelayCreateCoreSettings()
         {
             EditorApplication.delayCall -= DelayCreateCoreSettings;
             CoreSettingsLoader.EnsureSettingsExist();
+
         }
 
         /// <summary>
@@ -77,7 +76,6 @@ private static void InstallModules()
             Thread.Sleep(THREAD_SLEEP_TIME);
 
             ModuleInfo[] missingModules = GetMissingModuleNames();
-
             if (missingModules.Length > 0)
             {
                 var installedModuleCount = 0f;