On Win32, if we get a fatal error message while being debugged we break

2006-12-28  Tor Lillqvist  <tml@novell.com>

	* glib/gmessages.c (g_logv): On Win32, if we get a fatal error
	message while being debugged we break into the debugger with
	G_BREAKPOINT(). Don't call abort() if the user is foolhardy enough
	to continue after the breakpoint. The user presumably knows what
	he is doing and deserves what he gets. (#376645, Andreas Köhler)

diff --git a/ChangeLog b/ChangeLog
index 40bf81d601f9898fd5f98dd3cdda2a8cc8597ed0..41056284f289a27a77399541f189dc612d906f11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-28  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gmessages.c (g_logv): On Win32, if we get a fatal error
+       message while being debugged we break into the debugger with
+       G_BREAKPOINT(). Don't call abort() if the user is foolhardy enough
+       to continue after the breakpoint. The user presumably knows what
+       he is doing and deserves what he gets. (#376645, Andreas Köhler)
+
 Thu Dec 28 12:50:31 2006  Tim Janik  <timj@imendio.com>
 
        * glib/gslice.h, glib/gslice.c: implemented static debugging

diff --git a/glib/gmessages.c b/glib/gmessages.c
index 7ab390f1a10b2ec48ea764ce50309bb0797c3ab0..31d2e226e7cf16a8f911c017b1c1f9d0ffa36c5b 100644 (file)
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -485,8 +485,8 @@ g_logv (const gchar   *log_domain,
                          MB_ICONERROR|MB_SETFOREGROUND);
              if (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION))
                G_BREAKPOINT ();
-
-             abort ();
+             else
+               abort ();
 #else
 #if defined (G_ENABLE_DEBUG) && defined (SIGTRAP)
              if (!(test_level & G_LOG_FLAG_RECURSION))