MiniDump update: MessageBox, nocrashdump

Fixes "OK" button on MiniDump notification by re-enabling UI events before application close.  Console -nocrashdump option fixed.

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index d04d6a1f2a76c06dbb26dd565c7de94f0d4c84b4..d532e7a1069253b818e9483b1d38213991444ebf 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -397,7 +397,7 @@ void target_calibrate_spin(void)
                        if (vp2 > vp + cntlines * 2)
                                break;
                }
-trynext:;
+trynext:
        }
        if (sc == 0x800000000000) {
                write_log(_T("Spincount calculation error, spinloop not used.\n"), sc);
@@ -7385,9 +7385,11 @@ static void create_dump (struct _EXCEPTION_POINTERS *pExceptionPointers)
                                        ShowCursor(TRUE);
                                        if (debugfile)
                                                log_close(debugfile);
-                                       if (isfullscreen () <= 0) {
-                                               _stprintf (msg, _T("Crash detected. MiniDump saved as:\n%s\n"), path3);
-                                               MessageBox (NULL, msg, _T("Crash"), MB_OK | MB_ICONWARNING | MB_TASKMODAL | MB_SETFOREGROUND);
+                                       if (isfullscreen() <= 0) {
+                                               all_events_disabled = 0;
+                                               struct AmigaMonitor *mon = &AMonitors[0];
+                                               _stprintf(msg, _T("Crash detected. MiniDump saved as:\n%s\n"), path3);
+                                               MessageBox(mon->hStatusWnd ? mon->hStatusWnd : NULL, msg, _T("Crash"), MB_OK | MB_ICONWARNING | MB_TASKMODAL | MB_SETFOREGROUND);
                                        }
                                        ExitProcess(0);
                                }
@@ -7402,7 +7404,7 @@ static void create_dump (struct _EXCEPTION_POINTERS *pExceptionPointers)
 LONG WINAPI WIN32_ExceptionFilter (struct _EXCEPTION_POINTERS * pExceptionPointers, DWORD ec)
 {
        if (nocrashdump || isfullscreen() > 0)
-               EXCEPTION_CONTINUE_SEARCH;
+               return EXCEPTION_CONTINUE_SEARCH;
        write_log (_T("EVALEXCEPTION %08x!\n"), ec);
        create_dump  (pExceptionPointers);
        return EXCEPTION_CONTINUE_SEARCH;