Changeset 510 in josm for trunk/src/org

Timestamp:

2008-01-03T23:21:51+01:00 (17 years ago)

Author:

framm

Message:

• fix bug that would not properly overwrite existing files, as identified by Petr Nejedly <Petr.Nejedly@…>

File:

• trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) (1 diff)

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

@@ -161 +161 @@
                         e.printStackTrace();
                         JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while saving.")+"\n"+e.getMessage());
-                }
-                try {
-                        // if the file save failed, then the tempfile will not
-                        // be deleted.  So, restore the backup if we made one.
-                        if (tmpFile != null && tmpFile.exists()) {
-                                copy(tmpFile, file);
-                        }
-                } catch (IOException e) {
-                        e.printStackTrace();
-                        JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while restoring backup file.")+"\n"+e.getMessage());
+
+                        try {
+                                // if the file save failed, then the tempfile will not
+                                // be deleted.  So, restore the backup if we made one.
+                                if (tmpFile != null && tmpFile.exists()) {
+                                        copy(tmpFile, file);
+                                }
+                        } catch (IOException e2) {
+                                e2.printStackTrace();
+                                JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while restoring backup file.")+"\n"+e2.getMessage());
+                        }
                 }
         }