Index: trunk/src/org/openstreetmap/josm/actions/DownloadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 611)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 612)
@@ -68,4 +68,5 @@
         }
 
+                dialog = null;
 		dlg.dispose();
 	}
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 611)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 612)
@@ -26,5 +26,5 @@
 		private final boolean newLayer;
 
-		public Task(boolean newLayer, BoundingBoxDownloader reader, DownloadAction action) {
+		public Task(boolean newLayer, BoundingBoxDownloader reader) {
 			super(tr("Downloading GPS data"));
 			this.reader = reader;
@@ -70,5 +70,5 @@
 
 	public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {
-		Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), action);
+		Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
 		Main.worker.execute(task);
 	}
Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 611)
+++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 612)
@@ -127,13 +127,4 @@
 		eventSource.addMouseMotionListener(this);
 		selectionEndedListener.addPropertyChangeListener(this);
-		Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "SelectionManager");
-        Main.contentPane.getActionMap().put("SelectionManager", new AbstractAction(){
-			public void actionPerformed(ActionEvent e) {
-				if (mousePos != null && mousePosStart != null)
-					paintRect();
-				mousePosStart = null;
-				mousePos = null;
-            }
-        });
         eventSource.addPropertyChangeListener("scale", new PropertyChangeListener(){
 			public void propertyChange(PropertyChangeEvent evt) {
@@ -155,6 +146,4 @@
 		eventSource.removeMouseMotionListener(this);
 		selectionEndedListener.removePropertyChangeListener(this);
-		Main.contentPane.getInputMap().remove(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
-		Main.contentPane.getActionMap().remove("SelectionManager");
 	}