diff --git a/ChangeLog b/ChangeLog index f7d7b0f10..fb4b02085 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ * glib/gmessages.c (g_logv): For fatal messages on Win32, use G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being - debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit(). + debugged. Suggestion by Ulf Lamping. 2005-01-18 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f7d7b0f10..fb4b02085 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -5,7 +5,7 @@ * glib/gmessages.c (g_logv): For fatal messages on Win32, use G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being - debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit(). + debugged. Suggestion by Ulf Lamping. 2005-01-18 Matthias Clasen diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index f7d7b0f10..fb4b02085 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -5,7 +5,7 @@ * glib/gmessages.c (g_logv): For fatal messages on Win32, use G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being - debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit(). + debugged. Suggestion by Ulf Lamping. 2005-01-18 Matthias Clasen diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f7d7b0f10..fb4b02085 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -5,7 +5,7 @@ * glib/gmessages.c (g_logv): For fatal messages on Win32, use G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being - debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit(). + debugged. Suggestion by Ulf Lamping. 2005-01-18 Matthias Clasen diff --git a/glib/gmessages.c b/glib/gmessages.c index 5b394f4c5..ef6e7a584 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -476,17 +476,11 @@ g_logv (const gchar *log_domain, #ifdef G_OS_WIN32 gchar *locale_msg = g_locale_from_utf8 (fatal_msg_buf, -1, NULL, NULL, NULL); + MessageBox (NULL, locale_msg, NULL, + MB_ICONERROR|MB_SETFOREGROUND); if (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION)) - { - MessageBox (NULL, locale_msg, NULL, - MB_ICONERROR|MB_SETFOREGROUND); - G_BREAKPOINT (); - } + G_BREAKPOINT (); - FatalAppExit (0, locale_msg); - /* In case somebody runs a debug Windows and chooses to - * continue, don't let her. - */ abort (); #else #if defined (G_ENABLE_DEBUG) && defined (SIGTRAP)