TISTUD-3860 Fixing an edge case with clearing the preference

aptana · Mar 23, 2013 · 9d6f5ea · 9d6f5ea
1 parent 3b1b31a
commit 9d6f5ea
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/plugins/com.aptana.ui/src/com/aptana/ui/DialogUtils.java b/plugins/com.aptana.ui/src/com/aptana/ui/DialogUtils.java
@@ -76,10 +76,10 @@ public static int openIgnoreMessageDialogInformation(Shell shell, String title,
 	public static int openIgnoreMessageDialogConfirm(Shell shell, String title, String message, IPreferenceStore store,
 			String key)
 	{
-		if (!shouldShowDialog(key))
+		String value = store.getString(key);
+		if (!shouldShowDialog(key) || value != MessageDialogWithToggle.PROMPT)
 		{
-			String value = store.getString(key);
-			return value == MessageDialogWithToggle.ALWAYS ? IDialogConstants.YES_ID : IDialogConstants.CANCEL_ID;
+			return value == MessageDialogWithToggle.ALWAYS ? IDialogConstants.YES_ID : IDialogConstants.NO_ID;
 		}
 		MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoQuestion(shell, title, message,
 				Messages.DialogUtils_doNotShowMessageAgain, false, store, key);