chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge extra MIME parsing
[disorder]
/
server
/
state.c
diff --git
a/server/state.c
b/server/state.c
index 4ff2654e7156ec46410535a8fb8b2e69f69c968f..79cae43bbf2f4b957667c6488ae0b3343437276c 100644
(file)
--- a/
server/state.c
+++ b/
server/state.c
@@
-57,7
+57,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) {
@@
-151,8
+151,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) {