diff options
| author | Colin Walters <walters@verbum.org> | 2013-05-21 00:07:18 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-05-21 00:07:18 +0100 |
| commit | f2a9a6142c7187b6dd700728ecfa5ea094ad6096 (patch) | |
| tree | dbf2a5d09d1f7a7e8283e45906f9a7ad3baf95ee | |
| parent | c12538a9c0693d9204bee0ef43dc505a52c55ba2 (diff) | |
| download | glib-f2a9a6142c7187b6dd700728ecfa5ea094ad6096.tar.gz | |
gmessages: Fix up testing commit to handle fatal masquerading
This makes glib/tests/testing pass again.
| -rw-r--r-- | glib/gmessages.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/glib/gmessages.c b/glib/gmessages.c index daab0c446..1548f06f5 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -966,7 +966,7 @@ g_logv (const gchar *log_domain, && !fatal_log_func (log_domain, test_level, msg, fatal_log_data); } - if ((test_level & G_LOG_FLAG_FATAL) && exit_on_fatal) + if ((test_level & G_LOG_FLAG_FATAL) && exit_on_fatal && !masquerade_fatal) { _g_log_abort (); } |