Merge branch 'master' into static

Conflicts:
	plugins/artwork/artwork.c
	plugins/gtkui/coverart.c

1 files changed, 6 insertions, 1 deletions

diff --git a/main.c b/main.c
index 890b1c77..9e9bb6b7 100644
--- a/main.c
+++ b/main.c
@@ -431,8 +431,8 @@ player_mainloop (void) {
     }
 }
 
+#if 0
 static int sigterm_handled = 0;
-
 void
 atexit_handler (void) {
     fprintf (stderr, "atexit_handler\n");
@@ -451,6 +451,7 @@ sigterm_handler (int sig) {
     fprintf (stderr, "bye.\n");
     exit (0);
 }
+#endif
 
 #ifdef __linux__
 void
@@ -758,8 +759,10 @@ main (int argc, char *argv[]) {
     if (server_start () < 0) {
         exit (-1);
     }
+#if 0
     signal (SIGTERM, sigterm_handler);
     atexit (atexit_handler); // helps to save in simple cases
+#endif
 
     // start all subsystems
     plug_trigger_event_playlistchanged ();
@@ -806,7 +809,9 @@ main (int argc, char *argv[]) {
     conf_free ();
     messagepump_free ();
     plug_cleanup ();
+#if 0
     sigterm_handled = 1;
+#endif
     fprintf (stderr, "hej-hej!\n");
     return 0;
 }