Index: trunk/src/org/openstreetmap/josm/actions/RestartAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 17390)
+++ trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 17391)
@@ -100,6 +100,10 @@
         }
 
-        // Initiate shutdown
-        if (isRestartSupported() && !MainApplication.exitJosm(false, 0, SaveLayersDialog.Reason.RESTART))
+        // Leave early if restart is not possible
+        if (!isRestartSupported())
+            return;
+
+        // Initiate shutdown with a chance for user to cancel
+        if (!MainApplication.exitJosm(false, 0, SaveLayersDialog.Reason.RESTART))
             return;