tidy up upgrade/recovery flags a bit

[disorder] / server / state.c

diff --git a/server/state.c b/server/state.c
index 45954f05e0b5d817b017a5ad83fafa17d583a141..66760f0963f1353a9db68162763c3eb48462b441 100644 (file)
--- a/server/state.c
+++ b/server/state.c
@@ -41,6 +41,7 @@
 #include "configuration.h"
 #include "log.h"
 #include "queue.h"
+#include "server-queue.h"
 #include "server.h"
 #include "printf.h"
 #include "addr.h"
@@ -150,8 +151,10 @@ int reconfigure(ev_source *ev, int reload) {
       speaker_reload();
       info("%s: installed new configuration", configfile);
     }
-  }
-  trackdb_open();
+    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) {