Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not ask if one wants to enter password, just ask for password

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-11-08 19:34:10 +01:00
parent 5b2dbe026c
commit c6e26e121f
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/status.cpp
View File

@@ -175,21 +175,12 @@ void NcmpcppErrorCallback(Connection *, int errorid, const char *msg, void *)
{ {
if (errorid == MPD_SERVER_ERROR_PERMISSION) if (errorid == MPD_SERVER_ERROR_PERMISSION)
{ {
Statusbar() << msg << ", enter password ? [" << fmtBold << 'y' << fmtBoldEnd << "/" << fmtBold << 'n' << fmtBoldEnd << "]"; wFooter->SetGetStringHelper(0);
wFooter->Refresh(); Statusbar() << "Password: ";
int answer = 0; Mpd.SetPassword(wFooter->GetString(-1, 0, 1));
do if (Mpd.SendPassword())
wFooter->ReadKey(answer); ShowMessage("Password accepted!");
while (answer != 'y' && answer != 'n'); wFooter->SetGetStringHelper(StatusbarGetStringHelper);
if (answer == 'y')
{
wFooter->SetGetStringHelper(0);
Statusbar() << "Password: ";
Mpd.SetPassword(wFooter->GetString(-1, 0, 1));
if (Mpd.SendPassword())
ShowMessage("Password accepted!");
wFooter->SetGetStringHelper(StatusbarGetStringHelper);
}
} }
else else
ShowMessage("%s", msg); ShowMessage("%s", msg);