diff -r 052ce4cf06c6 -r b6674724612a eric6/Debugger/DebugServer.py
--- a/eric6/Debugger/DebugServer.py Sun Feb 02 19:29:56 2020 +0100
+++ b/eric6/Debugger/DebugServer.py Mon Feb 03 19:54:02 2020 +0100
@@ -124,7 +124,6 @@
"""
clientClearBreak = pyqtSignal(str, int, str)
clientClearWatch = pyqtSignal(str, str)
- # TODO: check this signal for debuggerId
clientGone = pyqtSignal(bool)
clientProcessStdout = pyqtSignal(str)
clientProcessStderr = pyqtSignal(str)
@@ -148,7 +147,6 @@
clientBanner = pyqtSignal(str, str, str, str)
clientCapabilities = pyqtSignal(int, str, str)
clientCompletionList = pyqtSignal(list, str)
- # TODO: check this signal for debuggerId
clientInterpreterChanged = pyqtSignal(str)
clientDebuggerIds = pyqtSignal(list)
utDiscovered = pyqtSignal(list, str, str)
@@ -1792,7 +1790,6 @@
"""
Public method to process the last client exit event.
"""
- # TODO: Why is this not called anymore?
if self.passive:
self.__passiveShutDown()
self.lastClientExited.emit()
@@ -2075,8 +2072,8 @@
self.passiveClientExited = False
self.debugging = True
self.running = True
- self.__restoreBreakpoints()
- self.__restoreWatchpoints()
+ self.__restoreBreakpoints(debuggerId)
+ self.__restoreWatchpoints(debuggerId)
self.passiveDebugStarted.emit(fn, exc)
def __passiveShutDown(self):
