Do not open console window automatically when debugger message is logged.

diff --git a/debug.cpp b/debug.cpp
index efc7125d0e0e9104caf6a5eae99d985e07bffe00..4a7e4e658d146a137e6ddf22a2bb5b546c7335df 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -118,6 +118,7 @@ void activate_debugger (void)
                return;
 
        debugger_load_libraries();
+       open_console();
 
        debugger_used = 1;
        inside_debugger = 1;
@@ -7169,6 +7170,7 @@ static TCHAR input[MAX_LINEWIDTH];
 
 static void debug_1 (void)
 {
+       open_console();
        custom_dumpstate(0);
        m68k_dumpstate(&nextpc, debug_pc);
        debug_pc = 0xffffffff;

diff --git a/include/sysdeps.h b/include/sysdeps.h
index 5508440a1eb9b428b752fc2bb8d9ce4a47ac850b..97f24335f0d30cab18eba906129a451d5422f13d 100644 (file)
--- a/include/sysdeps.h
+++ b/include/sysdeps.h
@@ -456,7 +456,8 @@ extern int read_log(void);
 extern void flush_log (void);
 extern TCHAR *setconsolemode (TCHAR *buffer, int maxlen);
 extern void close_console (void);
-extern void reopen_console (void);
+extern void open_console(void);
+extern void reopen_console(void);
 extern void activate_console (void);
 extern void console_out (const TCHAR *);
 extern void console_out_f (const TCHAR *, ...);

diff --git a/od-win32/writelog.cpp b/od-win32/writelog.cpp
index 8add362c908d73924d3ded491d42875a2babbe8f..415eaa9fcfd635bbb5eca0a1b218aa4f3e90a811 100644 (file)
--- a/od-win32/writelog.cpp
+++ b/od-win32/writelog.cpp
@@ -197,6 +197,13 @@ void debugger_change (int mode)
        openconsole ();
 }
 
+void open_console(void)
+{
+       if (!consoleopen) {
+               openconsole();
+       }
+}
+
 void reopen_console (void)
 {
        HWND hwnd;
@@ -363,7 +370,7 @@ static void console_put (const TCHAR *buffer)
        if (console_buffer) {
                if (_tcslen (console_buffer) + _tcslen (buffer) < console_buffer_size)
                        _tcscat (console_buffer, buffer);
-       } else {
+       } else if (consoleopen) {
                openconsole ();
                writeconsole (buffer);
        }
@@ -632,7 +639,7 @@ void write_logx(const TCHAR *format, ...)
                break;
        }
        bufp[bufsize - 1] = 0;
-       if (1) {
+       if (consoleopen) {
                writeconsole (bufp);
        }
        if (debugfile) {
@@ -732,7 +739,7 @@ void f_out (void *f, const TCHAR *format, ...)
        va_list parms;
        va_start (parms, format);
 
-       if (f == NULL)
+       if (f == NULL || !consoleopen)
                return;
        count = _vsntprintf (buffer, WRITE_LOG_BUF_SIZE - 1, format, parms);
        openconsole ();