Index: trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java	(revision 2522)
+++ trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java	(revision 2523)
@@ -108,5 +108,5 @@
         if (!getDialogShowingEnabled(preferenceKey))
             return DIALOG_DISABLED_OPTION;
-        MessagePanel pnl = new MessagePanel(preferenceKey, message);
+        MessagePanel pnl = new MessagePanel(false, message);
         int ret = JOptionPane.showOptionDialog(parent, pnl, title, optionType, messageType, null,options,defaultOption);
 
@@ -147,7 +147,8 @@
      */
     static public boolean showConfirmationDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, int trueOption) throws HeadlessException {
-        if (!getDialogShowingEnabled(preferenceKey) && (getDialogReturnValue(preferenceKey) >= 0))
+        boolean donotshow = getDialogShowingEnabled(preferenceKey);
+        if (donotshow && (getDialogReturnValue(preferenceKey) >= 0))
             return getDialogReturnValue(preferenceKey) == trueOption;
-        MessagePanel pnl = new MessagePanel(preferenceKey, message);
+        MessagePanel pnl = new MessagePanel(donotshow, message);
         int ret = JOptionPane.showConfirmDialog(parent, pnl, title, optionType, messageType);
         if ((ret >= 0) && !pnl.getDialogShowingEnabled()) {
@@ -179,5 +180,5 @@
         if (!getDialogShowingEnabled(preferenceKey))
             return;
-        MessagePanel pnl = new MessagePanel(preferenceKey, message);
+        MessagePanel pnl = new MessagePanel(false, message);
         JOptionPane.showMessageDialog(parent, pnl, title, messageType);
         if(!pnl.getDialogShowingEnabled())
@@ -194,10 +195,8 @@
     private static class MessagePanel extends JPanel {
         JCheckBox cbShowDialog;
-        String preferenceKey;
-
-        public MessagePanel(String preferenceKey, Object message) {
-            this.preferenceKey = preferenceKey;
+
+        public MessagePanel(boolean donotshow, Object message) {
             cbShowDialog = new JCheckBox(tr("Do not show again"));
-            cbShowDialog.setSelected(!ConditionalOptionPaneUtil.getDialogShowingEnabled(preferenceKey));
+            cbShowDialog.setSelected(donotshow);
             setLayout(new GridBagLayout());