Mercurial Repositories > eric / changeset

--- a/eric7/Debugger/DebugServer.py	Mon May 23 17:23:21 2022 +0200
+++ b/eric7/Debugger/DebugServer.py	Mon May 23 17:24:39 2022 +0200
@@ -497,9 +497,12 @@
         # only start the client, if we are not in passive mode
         if not self.passive:
             if self.clientProcess:
-                self.clientProcess.kill()
-                self.clientProcess.waitForFinished(1000)
-                self.clientProcess.deleteLater()
+                with contextlib.suppress(RuntimeError):
+                    # Workaround: The wrapped C/C++ object of type QProcess
+                    # gets deleted prematurely sometimes.
+                    self.clientProcess.kill()
+                    self.clientProcess.waitForFinished(1000)
+                    self.clientProcess.deleteLater()
                 self.clientProcess = None
             
             self.__forProject = forProject

--- a/eric7/UI/UserInterface.py	Mon May 23 17:23:21 2022 +0200
+++ b/eric7/UI/UserInterface.py	Mon May 23 17:24:39 2022 +0200
@@ -4433,7 +4433,7 @@
         @rtype bool
         """
         yes = EricMessageBox.yesNo(
-            self,
+            None,
             self.tr("Upgrade PyQt"),
             self.tr("""eric needs to be closed in order to upgrade PyQt. It"""
                     """ will be restarted once the upgrade process has"""
@@ -4456,7 +4456,7 @@
         @rtype bool
         """
         yes = EricMessageBox.yesNo(
-            self,
+            None,
             self.tr("Upgrade Eric"),
             self.tr("""eric needs to be closed in order to be upgraded. It"""
                     """ will be restarted once the upgrade process has"""
@@ -4480,7 +4480,7 @@
         @rtype bool
         """
         yes = EricMessageBox.yesNo(
-            self,
+            None,
             self.tr("Upgrade Eric"),
             self.tr("""eric needs to be closed in order to upgrade eric and"""
                     """ PyQt. It will be restarted once the upgrade process"""