From 80ffb7e3d3f1991c06b75ac3a8b00b4d5aa73526 Mon Sep 17 00:00:00 2001
From: Marco Maccaferri <marco.maccaferri@maccasoft.com>
Date: Fri, 14 Aug 2020 11:28:58 +0200
Subject: [PATCH] Fixed debug terminal output

---
 src/com/maccasoft/tools/Application.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/com/maccasoft/tools/Application.java b/src/com/maccasoft/tools/Application.java
index dcc3b59..4c5d9d7 100644
--- a/src/com/maccasoft/tools/Application.java
+++ b/src/com/maccasoft/tools/Application.java
@@ -277,7 +277,9 @@ public class Application {
 
             @Override
             public void widgetDisposed(DisposeEvent e) {
-                debugger.doStop();
+                if (debugger != null) {
+                    debugger.doStop();
+                }
                 if (terminal != null) {
                     terminal.dispose();
                     terminal = null;
@@ -2391,6 +2393,9 @@ public class Application {
                         }
 
                     };
+
+                    debugger.setDebugTerminal(debugTerminal);
+
                     debugger.tms9918Ram = preferences.getTms9918Ram();
                     debugger.tms9918Reg = preferences.getTms9918Register();
 
@@ -2612,8 +2617,14 @@ public class Application {
                 @Override
                 public void widgetDisposed(DisposeEvent e) {
                     debugTerminal = null;
+                    if (debugger != null) {
+                        debugger.setDebugTerminal(debugTerminal);
+                    }
                 }
             });
+            if (debugger != null) {
+                debugger.setDebugTerminal(debugTerminal);
+            }
         }
         debugTerminal.setFocus();
     }