brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta_quit: ignore repeated calls after it's already quitting

Browse Source 
meta_run() calls meta_finalize() after the main loop exits, which ends
up calling meta_display_close(), which calls
meta_quit(META_EXIT_SUCCESS), meaning that any exit status passed to
the original meta_quit() call is lost.

Fix this by ignoring meta_quit() calls after the main loop is no
longer running.

https://bugzilla.gnome.org/show_bug.cgi?id=652010
This commit is contained in:
Dan Winship 2011-06-06 16:18:09 -04:00
parent 9804841adb
commit c70087db0c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/main.c
View File

@ -571,11 +571,12 @@ meta_run (void)
void void
meta_quit (MetaExitCode code) meta_quit (MetaExitCode code)
{ {
meta_exit_code = code;
if (g_main_loop_is_running (meta_main_loop)) if (g_main_loop_is_running (meta_main_loop))
{
meta_exit_code = code;
g_main_loop_quit (meta_main_loop); g_main_loop_quit (meta_main_loop);
} }
}
/** /**
* Called on pref changes. (One of several functions of its kind and purpose.) * Called on pref changes. (One of several functions of its kind and purpose.)