From c33e1fb3b6b4dd612d449dbafec41d339edbc1a2 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 7 Oct 2019 14:54:26 +0200 Subject: [PATCH] Synchronously unload plugin when installing update in synchronous load/unload mode (IDEA-224223) GitOrigin-RevId: de69400bbdf8cffe575b58e8f21ba10fc73b83e4 --- .../src/com/intellij/ide/plugins/newui/MyPluginModel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/MyPluginModel.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/MyPluginModel.java index b48f46bdd664..971eaf05bc40 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/MyPluginModel.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/MyPluginModel.java @@ -325,6 +325,11 @@ public class MyPluginModel extends InstalledPluginsTableModel implements PluginM if (installedPluginDescriptor == null || !DynamicPlugins.allowLoadUnloadWithoutRestart(installedPluginDescriptor)) { allowUninstallWithoutRestart = false; } + else if (DynamicPlugins.allowLoadUnloadSynchronously(installedPluginDescriptor)) { + if (!PluginInstaller.uninstallDynamicPlugin(installedPluginDescriptor)) { + allowUninstallWithoutRestart = false; + } + } else { performUninstall(installedPluginDescriptor); }