Mercurial Repositories > eric / file diff

--- a/eric6/Debugger/DebugUI.py	Wed Jan 06 13:58:40 2021 +0100
+++ b/eric6/Debugger/DebugUI.py	Wed Jan 06 14:06:40 2021 +0100
@@ -1115,54 +1115,31 @@
         if not quiet:
             if not program:
                 program = self.ui.currentProg
-            if (
-                not Preferences.getDebugger("SuppressClientExit") or
-                status != 0
-            ):
-                # TODO: test if this is still needed
-                if message:
-                    info = self.tr("<p>Message: {0}</p>").format(
-                        Utilities.html_uencode(message))
-                else:
-                    info = ""
-                if program is None:
-                    E5MessageBox.information(
-                        self.ui, Program,
-                        self.tr('<p>The program has terminated with an exit'
-                                ' status of {0}.</p>{1}').format(status, info)
-                    )
-                else:
-                    E5MessageBox.information(
-                        self.ui, Program,
-                        self.tr('<p><b>{0}</b> has terminated with an exit'
-                                ' status of {1}.</p>{2}').format(
-                            os.path.abspath(program), status, info)
-                    )
+            
+            if message:
+                info = self.tr("Message: {0}").format(
+                    Utilities.html_uencode(message))
+            else:
+                info = ""
+            if program is None:
+                msg = self.tr(
+                    '<p>The program has terminated with an exit status of'
+                    ' {0}.</p><p>{1}</p>').format(status, info)
             else:
-                if message:
-                    info = self.tr("Message: {0}").format(
-                        Utilities.html_uencode(message))
-                else:
-                    info = ""
-                if program is None:
-                    msg = self.tr(
-                        'The program has terminated with an exit status of'
-                        ' {0}.\n{1}').format(status, info)
-                else:
-                    msg = self.tr(
-                        '"{0}" has terminated with an exit status of'
-                        ' {1}.\n{2}').format(
-                        os.path.basename(program), status, info)
-                if status != 0:
-                    timeout = 0
-                    kind = NotificationTypes.Warning
-                else:
-                    timeout = None
-                    kind = NotificationTypes.Information
-                self.ui.showNotification(
-                    UI.PixmapCache.getPixmap("debug48"),
-                    self.tr("Program terminated"), msg, kind=kind,
-                    timeout=timeout)
+                msg = self.tr(
+                    '<p><b>{0}</b> has terminated with an exit status of'
+                    ' {1}.</p><p>{2}</p>').format(
+                    os.path.basename(program), status, info)
+            if status != 0:
+                timeout = 0
+                kind = NotificationTypes.Warning
+            else:
+                timeout = None
+                kind = NotificationTypes.Information
+            self.ui.showNotification(
+                UI.PixmapCache.getPixmap("debug48"),
+                self.tr("Program terminated"), msg, kind=kind,
+                timeout=timeout)
     
     def __lastClientExited(self):
         """