diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs index 73ef523e9..4c9074043 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs @@ -2176,7 +2176,7 @@ internal class PluginInstallerWindow : Window, IDisposable this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting); } - if (availablePluginUpdate != default) + if (availablePluginUpdate != default && ! plugin.IsDev) this.DrawUpdateSinglePluginButton(availablePluginUpdate); ImGui.SameLine(); diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs index a647c1d03..15d975d0b 100644 --- a/Dalamud/Plugin/Internal/PluginManager.cs +++ b/Dalamud/Plugin/Internal/PluginManager.cs @@ -1144,44 +1144,28 @@ Thanks and have fun!"; if (plugin.IsDev) { - // TODO: Does this ever work? Why? We should never update devplugins - try - { - plugin.DllFile.Delete(); - lock (this.pluginListLock) - { - this.InstalledPlugins = this.InstalledPlugins.Remove(plugin); - } - } - catch (Exception ex) - { - Log.Error(ex, "Error during delete (update)"); - updateStatus.WasUpdated = false; - return updateStatus; - } + throw new Exception("We should never update a dev plugin"); } - else + + try { - try - { - // TODO: Why were we ever doing this? We should never be loading the old version in the first place - /* + // TODO: Why were we ever doing this? We should never be loading the old version in the first place + /* if (!plugin.IsDisabled) plugin.Disable(); */ - lock (this.pluginListLock) - { - this.InstalledPlugins = this.InstalledPlugins.Remove(plugin); - } - } - catch (Exception ex) + lock (this.pluginListLock) { - Log.Error(ex, "Error during disable (update)"); - updateStatus.WasUpdated = false; - return updateStatus; + this.InstalledPlugins = this.InstalledPlugins.Remove(plugin); } } + catch (Exception ex) + { + Log.Error(ex, "Error during disable (update)"); + updateStatus.WasUpdated = false; + return updateStatus; + } // We need to handle removed DTR nodes here, as otherwise, plugins will not be able to re-add their bar entries after updates. var dtr = Service.Get();