Changeset 9687 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-01-30T15:37:54+01:00 (8 years ago)

Author:

bastiK

Message:

applied #12380 - fixed confirmation of overwriting existing file (patch by kolesar)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SaveActionBase.java (modified) (1 diff)
• gui/widgets/FileChooserManager.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -205 +205 @@
             }
             file = new File(fn);
-            // Confirm overwrite, except for OSX native file dialogs which already ask for confirmation (see #11362)
-            if (!(Main.isPlatformOsx() && FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.get()) && !confirmOverwrite(file))
+            if (!fc.getSelectedFile().exists() && !confirmOverwrite(file))
                 return null;
         }

trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java

@@ -348 +348 @@
         }
 
-        if (!open && !SaveActionBase.confirmOverwrite(fc.getSelectedFile())) {
+        if (!open && !FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.get() &&
+            !SaveActionBase.confirmOverwrite(fc.getSelectedFile())) {
             return null;
         }