~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgi: actually use the connection from the new login after logging in!
[disorder]
/
server
/
state.c
diff --git
a/server/state.c
b/server/state.c
index
45954f0
..
d6b6699
100644
(file)
--- a/
server/state.c
+++ b/
server/state.c
@@
-36,11
+36,13
@@
#include "event.h"
#include "play.h"
#include "event.h"
#include "play.h"
+#include "rights.h"
#include "trackdb.h"
#include "state.h"
#include "configuration.h"
#include "log.h"
#include "queue.h"
#include "trackdb.h"
#include "state.h"
#include "configuration.h"
#include "log.h"
#include "queue.h"
+#include "server-queue.h"
#include "server.h"
#include "printf.h"
#include "addr.h"
#include "server.h"
#include "printf.h"
#include "addr.h"
@@
-56,7
+58,7
@@
void quit(ev_source *ev) {
trackdb_close();
trackdb_deinit();
info("terminating");
trackdb_close();
trackdb_deinit();
info("terminating");
-
_
exit(0);
+ exit(0);
}
static void reset_socket(ev_source *ev) {
}
static void reset_socket(ev_source *ev) {
@@
-150,8
+152,10
@@
int reconfigure(ev_source *ev, int reload) {
speaker_reload();
info("%s: installed new configuration", configfile);
}
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) {
if(need_another_rescan)
trackdb_rescan(ev);
if(!ret) {