From cfd14d429692341890317254bcd8d141a2f097f6 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 2 Mar 2015 16:44:00 +0300 Subject: [PATCH] fixed restarting after installing update via patch --- .../openapi/updateSettings/impl/UpdateInfoDialog.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java index 99e3d59c43f2..12a2a1d5fae4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java @@ -145,6 +145,10 @@ class UpdateInfoDialog extends AbstractUpdateDialog { private void downloadPatch() { try { UpdateChecker.installPlatformUpdate(myPatch, myLatestBuild.getNumber(), myForceHttps); + if (myUpdatedPlugins != null && !myUpdatedPlugins.isEmpty()) { + new PluginUpdateInfoDialog(getContentPanel(), myUpdatedPlugins).show(); + } + restart(); } catch (IOException e) { Logger.getInstance(UpdateChecker.class).warn(e); @@ -154,11 +158,6 @@ class UpdateInfoDialog extends AbstractUpdateDialog { Messages.getErrorIcon()) == Messages.OK) { openDownloadPage(); } - return; - } - - if (myUpdatedPlugins != null && !myUpdatedPlugins.isEmpty()) { - new PluginUpdateInfoDialog(getContentPanel(), myUpdatedPlugins).show(); } }