From 919cebb0bcd44170a7dd773717eefa1e515d628c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 18 Sep 2008 09:44:01 +0200 Subject: quit with g_main_loop_quit() Call g_main_loop_quit() on CMD_QUIT, instead of exit() with an atexit() handler. --- src/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index f29ce67fd..c8b22df5f 100644 --- a/src/main.c +++ b/src/main.c @@ -263,6 +263,11 @@ keyboard_event(mpd_unused GIOChannel *source, g_source_remove(idle_source_id); if ((cmd=get_keyboard_command()) != CMD_NONE) { + if (cmd == CMD_QUIT) { + g_main_loop_quit(main_loop); + return FALSE; + } + screen_cmd(mpd, cmd); if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) { @@ -378,9 +383,6 @@ main(int argc, const char *argv[]) exit(EXIT_FAILURE); } - /* install exit function */ - atexit(exit_and_cleanup); - ncurses_init(); lyrics_init(); -- cgit v1.2.3