From 9697f0b7a0fcd717b0319b62f030c16cb327e1fb Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Tue, 31 Aug 2021 20:16:17 -0400
Subject: [PATCH] move DALAMUD_NOT_HAVE_PLUGINS into safeMode check

---
 Dalamud/Dalamud.cs                       | 25 +++++++++++-------------
 Dalamud/Plugin/Internal/PluginManager.cs |  3 ++-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index f54356d9b..c966fc27a 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -239,24 +239,21 @@ namespace Dalamud
                 var pluginManager = Service<PluginManager>.Set();
                 Service<CallGate>.Set();
 
-                if (!bool.Parse(Environment.GetEnvironmentVariable("DALAMUD_NOT_HAVE_PLUGINS") ?? "false"))
+                try
                 {
-                    try
-                    {
-                        pluginManager.OnInstalledPluginsChanged += Troubleshooting.LogTroubleshooting;
+                    pluginManager.OnInstalledPluginsChanged += Troubleshooting.LogTroubleshooting;
 
-                        Log.Information("[T3] PM OK!");
+                    Log.Information("[T3] PM OK!");
 
-                        pluginManager.CleanupPlugins();
-                        Log.Information("[T3] PMC OK!");
+                    pluginManager.CleanupPlugins();
+                    Log.Information("[T3] PMC OK!");
 
-                        pluginManager.LoadAllPlugins();
-                        Log.Information("[T3] PML OK!");
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error(ex, "Plugin load failed.");
-                    }
+                    pluginManager.LoadAllPlugins();
+                    Log.Information("[T3] PML OK!");
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, "Plugin load failed.");
                 }
 
                 Service<DalamudInterface>.Set();
diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs
index 7007dbc5f..ebcd099d3 100644
--- a/Dalamud/Plugin/Internal/PluginManager.cs
+++ b/Dalamud/Plugin/Internal/PluginManager.cs
@@ -62,7 +62,8 @@ namespace Dalamud.Plugin.Internal
             if (!this.devPluginDirectory.Exists)
                 this.devPluginDirectory.Create();
 
-            if (this.SafeMode = configuration.PluginSafeMode)
+            var noPlugins = bool.Parse(Environment.GetEnvironmentVariable("DALAMUD_NOT_HAVE_PLUGINS") ?? "false");
+            if (this.SafeMode = noPlugins || configuration.PluginSafeMode)
             {
                 configuration.PluginSafeMode = false;
                 configuration.Save();