From 7b85a89d4eabd2ce9bbe6fde98c39487b536b132 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 27 Sep 2016 16:36:37 +0300
Subject: [PATCH] better fix for IDEA-161754 (see IDEA-CR-14081)

---
 .../com/intellij/execution/TerminateRemoteProcessDialog.java  | 2 --
 .../intellij/openapi/application/impl/ApplicationImpl.java    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java b/platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java
index 6ea3e2f945d8..1f2ec6be9f0e 100644
--- a/platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java
+++ b/platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java
@@ -18,7 +18,6 @@ package com.intellij.execution;
 
 import com.intellij.CommonBundle;
 import com.intellij.ide.GeneralSettings;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
@@ -52,7 +51,6 @@ public class TerminateRemoteProcessDialog {
           GeneralSettings.ProcessCloseConfirmation confirmation = getConfirmation(exitCode, canDisconnect);
           if (confirmation != null) {
             GeneralSettings.getInstance().setProcessCloseConfirmation(confirmation);
-            ApplicationManager.getApplication().saveSettings();
           }
         }
       }
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index 0c11e0611a06..55ad7ac52a70 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -765,12 +765,12 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
 
       myDisposeInProgress = true;
 
-      saveSettings();
-
       if (!force && !canExit()) {
         return;
       }
 
+      saveSettings();
+
       boolean success = disposeSelf(!force);
       if (!success || isUnitTestMode()) {
         return;