diff options
author | Michał Cichoń <michcic@gmail.com> | 2015-12-05 16:07:26 +0100 |
---|---|---|
committer | Michał Cichoń <michcic@gmail.com> | 2015-12-05 16:07:26 +0100 |
commit | 13e06e633d966a7600794deb43d725cbd89e108c (patch) | |
tree | 5285721085c225f1a547830471e3a628d0657565 /src/main.c | |
parent | d25764daa0c4c1e4a5887ca1599d4975a7a799c6 (diff) | |
parent | 864afb87798a0669f9a58aaebba5d874546acffe (diff) | |
download | pianobar-windows-13e06e633d966a7600794deb43d725cbd89e108c.tar.gz pianobar-windows-13e06e633d966a7600794deb43d725cbd89e108c.tar.bz2 pianobar-windows-13e06e633d966a7600794deb43d725cbd89e108c.zip |
Merge branch 'release/2015.12.05'2015.12.05
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -337,11 +337,18 @@ int main (int argc, char **argv) { BarConsoleSetTitle (TITLE); /* init some things */ - BarPlayer2Init (&app.player); - BarSettingsInit (&app.settings); BarSettingsRead (&app.settings); + if (!BarPlayer2Init (&app.player, app.settings.player)) + { + if (app.settings.player) + BarUiMsg(&app.settings, MSG_ERR, "Player \"%s\" initialization failed.", app.settings.player); + else + BarUiMsg(&app.settings, MSG_ERR, "Player initialization failed."); + return 0; + } + PianoReturn_t pret; if ((pret = PianoInit (&app.ph, app.settings.partnerUser, app.settings.partnerPassword, app.settings.device, |