awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #514 from psychon/quit_during_startup 

Make awesome.quit() during startup work
This commit is contained in:
Daniel Hahler 2015-10-11 13:25:44 +02:00
parent f29264064f 7ed29196bb
commit 4803e1552d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awesome.c
View File

@ -621,9 +621,12 @@ main(int argc, char **argv)
g_main_context_set_poll_func(g_main_context_default(), &a_glib_poll);
gettimeofday(&last_wakeup, NULL);
/* main event loop */
globalconf.loop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(globalconf.loop);
/* main event loop (if not NULL, awesome.quit() was already called) */
if (globalconf.loop == NULL)
{
globalconf.loop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(globalconf.loop);
}
g_main_loop_unref(globalconf.loop);
globalconf.loop = NULL;

2
luaa.c
View File

@ -111,6 +111,8 @@ composite_manager_running(void)
static int
luaA_quit(lua_State *L)
{
if (globalconf.loop == NULL)
globalconf.loop = g_main_loop_new(NULL, FALSE);
g_main_loop_quit(globalconf.loop);
return 0;
}