MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-28 15:06:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change MPD deinit position so it matches the init order, and so it will not get called if httpd fails to start

Browse Source
This commit is contained in:
ejurgensen 2015-09-29 23:14:44 +02:00
parent 5125e24cfe
commit ebba164a0d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.c
View File

@ -827,17 +827,16 @@ main(int argc, char **argv)
remote_pairing_deinit(); remote_pairing_deinit();
remote_fail: remote_fail:
#ifdef MPD
DPRINTF(E_LOG, L_MAIN, "MPD deinit\n");
mpd_deinit();
mpd_fail:
#endif
DPRINTF(E_LOG, L_MAIN, "HTTPd deinit\n"); DPRINTF(E_LOG, L_MAIN, "HTTPd deinit\n");
httpd_deinit(); httpd_deinit();
httpd_fail: httpd_fail:
DPRINTF(E_LOG, L_MAIN, "TCPd deinit\n");
#ifdef MPD
DPRINTF(E_LOG, L_MAIN, "MPD deinit\n");
mpd_deinit();
mpd_fail:
#endif
DPRINTF(E_LOG, L_MAIN, "Player deinit\n"); DPRINTF(E_LOG, L_MAIN, "Player deinit\n");
player_deinit(); player_deinit();