X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/3dc3d7dbde4b666c7e829a27d5838e5ed49bdbe6..5df73aebf27f6c3b57a91ecfd504fa6ee367d20a:/server/state.c

diff --git a/server/state.c b/server/state.c
index 91bc078..d6b6699 100644
--- a/server/state.c
+++ b/server/state.c
@@ -36,6 +36,7 @@
 
 #include "event.h"
 #include "play.h"
+#include "rights.h"
 #include "trackdb.h"
 #include "state.h"
 #include "configuration.h"
@@ -57,7 +58,7 @@ void quit(ev_source *ev) {
   trackdb_close();
   trackdb_deinit();
   info("terminating");
-  _exit(0);
+  exit(0);
 }
 
 static void reset_socket(ev_source *ev) {
@@ -151,8 +152,10 @@ int reconfigure(ev_source *ev, int reload) {
       speaker_reload();
       info("%s: installed new configuration", configfile);
     }
-  }
-  trackdb_open(0);
+    trackdb_open(TRACKDB_NO_UPGRADE);
+  } else
+    /* We only allow for upgrade at startup */
+    trackdb_open(TRACKDB_CAN_UPGRADE);
   if(need_another_rescan)
     trackdb_rescan(ev);
   if(!ret) {