From 204f39c855a62d6b9239716eec4a37fb81fcd624 Mon Sep 17 00:00:00 2001 From: waker Date: Sun, 27 Nov 2011 12:49:46 +0100 Subject: fixed clearing playqueue on exit --- main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 91b7b145..ee1007a2 100644 --- a/main.c +++ b/main.c @@ -426,6 +426,7 @@ player_mainloop (void) { conf_save (); break; case DB_EV_TERMINATE: + pl_playqueue_clear (); term = 1; break; case DB_EV_PLAY_CURRENT: @@ -883,6 +884,7 @@ main (int argc, char *argv[]) { server_tid = thread_start (server_loop, NULL); // this runs in main thread (blocks right here) player_mainloop (); + // terminate server and wait for completion if (server_tid) { server_terminate = 1; @@ -924,9 +926,7 @@ main (int argc, char *argv[]) { conf_free (); messagepump_free (); plug_cleanup (); -#if 0 - sigterm_handled = 1; -#endif + fprintf (stderr, "hej-hej!\n"); return 0; } -- cgit v1.2.3