From dbc3985de32994dca2daf1f2555ce41835b04c12 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 23 Oct 2013 12:16:13 +0200 Subject: [PATCH] plugin advertiser: do not suggest to restart if no plugins were installed/enabled --- .../PluginsAdvertiserDialog.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java index b712bf3b9688..495ff7bc3231 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java @@ -92,17 +92,21 @@ public class PluginsAdvertiserDialog extends DialogWrapper { PluginManagerMain.notifyPluginsWereInstalled(null, myProject); } }; - try { - PluginManagerMain.downloadPlugins(nodes, myAllPlugins, notifyRunnable, null); - } - catch (IOException e) { - LOG.error(e); - } for (IdeaPluginDescriptor pluginDescriptor : pluginsToEnable) { PluginManagerCore.enablePlugin(pluginDescriptor.getPluginId().getIdString()); } - if (nodes.isEmpty()) { - notifyRunnable.run(); + if (!nodes.isEmpty()) { + try { + PluginManagerMain.downloadPlugins(nodes, myAllPlugins, notifyRunnable, null); + } + catch (IOException e) { + LOG.error(e); + } + } + else { + if (!pluginsToEnable.isEmpty()) { + notifyRunnable.run(); + } } super.doOKAction(); }