Index: trunk/src/org/openstreetmap/josm/data/AutosaveTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 3674)
+++ trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 3675)
@@ -9,4 +9,5 @@
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Deque;
@@ -245,11 +246,16 @@
         List<File> result = new ArrayList<File>();
         File[] files = autosaveDir.listFiles();
+        System.err.println("autosave debug (getUnsavedLayersFiles) files="+(files == null ? null : Arrays.toString(files)));
         if (files == null)
             return result;
         for (File file: files) {
+            System.err.println("autosave debug (getUnsavedLayersFiles) file="+file);
+
             if (file.isFile()) {
+                System.err.println("autosave debug (getUnsavedLayersFiles) isFile");
                 result.add(file);
             }
         }
+        System.err.println("autosave debug (getUnsavedLayersFiles) result="+result);
         return result;
     }
@@ -277,22 +283,49 @@
 
     private void moveToDeletedLayersFolder(File f) {
+        System.err.println("autosave debug (moveToDeletedLayersFolder) f="+f);
+        System.err.println("autosave debug (moveToDeletedLayersFolder) f.getName="+f.getName());
+
         File backupFile = new File(deletedLayersDir, f.getName());
+
+        System.err.println("autosave debug (moveToDeletedLayersFolder) backupFile="+backupFile);
         if (backupFile.exists()) {
-            deletedLayers.remove(backupFile);
-            backupFile.delete();
+            System.err.println("autosave debug (moveToDeletedLayersFolder) backupFile exisist");
+
+            boolean res = deletedLayers.remove(backupFile);
+
+            System.err.println("autosave debug (moveToDeletedLayersFolder) res="+res);
+
+            boolean res2 = backupFile.delete();
+
+            System.err.println("autosave debug (moveToDeletedLayersFolder) res2="+res2);
         }
         if (f.renameTo(backupFile)) {
+            System.err.println("autosave debug (moveToDeletedLayersFolder) rename ok");
+
             deletedLayers.add(backupFile);
+
+            System.err.println("autosave debug (moveToDeletedLayersFolder) deletedLayers="+deletedLayers);
         } else {
             System.err.println(String.format("Warning: Could not move autosaved file %s to %s folder", f.getName(), deletedLayersDir.getName()));
-            f.delete();
+            boolean res3 = f.delete();
+
+            System.err.println("autosave debug (moveToDeletedLayersFolder) res3="+res3);
         }
         while (deletedLayers.size() > PROP_DELETED_LAYERS.get()) {
-            deletedLayers.remove().delete();
+            File next = deletedLayers.remove();
+
+            System.err.println("autosave debug (moveToDeletedLayersFolder) next="+next);
+
+            boolean res4 = next.delete();
+
+            System.err.println("autosave debug (moveToDeletedLayersFolder) res4="+res4);
         }
     }
 
     public void dicardUnsavedLayers() {
-        for (File f: getUnsavedLayersFiles()) {
+        List<File> ulfs = getUnsavedLayersFiles();
+        System.err.println("autosave debug (dicardUnsavedLayers) ulfs="+ulfs);
+        for (File f: ulfs) {
+            System.err.println("autosave debug (dicardUnsavedLayers) f="+f);
             moveToDeletedLayersFolder(f);
         }
Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 3674)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 3675)
@@ -91,5 +91,5 @@
 
     /**
-     * This method sets up the most basic options for the dialog. Add all more
+     * This method sets up the most basic options for the dialog. Add more
      * advanced features with dedicated methods.
      * Possible features:
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 3674)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 3675)
@@ -254,4 +254,5 @@
             List<File> unsavedLayerFiles = autosaveTask.getUnsavedLayersFiles();
             if (!unsavedLayerFiles.isEmpty()) {
+                System.err.println("autosave debug: unsavedLayerFiles="+unsavedLayerFiles);
                 ExtendedDialog dialog = new ExtendedDialog(
                         Main.parent,
@@ -265,4 +266,5 @@
                 dialog.setButtonIcons(new String[] {"ok", "cancel", "dialogs/remove"});
                 int selection = dialog.showDialog().getValue();
+                System.err.println("autosave debug: user selection="+selection);
                 if (selection == 1) {
                     for (OsmDataLayer layer: autosaveTask.getUnsavedLayers()) {
@@ -271,5 +273,7 @@
                     AutoScaleAction.autoScale("data");
                 } else if (selection == 3) {
+                    System.err.println("autosave debug: discard autosaved layers");
                     autosaveTask.dicardUnsavedLayers();
+                    System.err.println("autosave debug: discard autosaved layers [DONE]");
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 3674)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 3675)
@@ -1,4 +1,3 @@
 // License: GPL. See LICENSE file for details.
-
 package org.openstreetmap.josm.gui;