--- a/Debugger/DebugServer.py	Fri Apr 15 19:55:52 2016 +0200
+++ b/Debugger/DebugServer.py	Sun Apr 17 21:26:28 2016 +0200
@@ -1339,7 +1339,8 @@
         if self.passive:
             self.__passiveShutDown()
         self.clientExit.emit(int(status))
-        if Preferences.getDebugger("AutomaticReset"):
+        if Preferences.getDebugger("AutomaticReset") or (self.running and
+                                                         not self.debugging):
             self.startClient(False)
         if self.passive:
             self.__createDebuggerInterface("None")