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

ncmpcpp: check for list emptiness before taking current element from it

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-08-16 14:13:24 +02:00
parent 2aa053d7e1
commit b1bb7ec295
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ncmpcpp.cpp
View File

@@ -1539,7 +1539,9 @@ int main(int argc, char *argv[])
} }
} }
} }
else if (myScreen->ActiveWindow() == myTagEditor->Dirs) else if (myScreen->ActiveWindow() == myTagEditor->Dirs
&& !myTagEditor->Dirs->Empty()
&& myTagEditor->Dirs->Choice() > 0)
{ {
std::string old_dir = myTagEditor->Dirs->Current().first; std::string old_dir = myTagEditor->Dirs->Current().first;
LockStatusbar(); LockStatusbar();
@@ -1569,7 +1571,7 @@ int main(int argc, char *argv[])
{ {
myLyrics->Edit(); myLyrics->Edit();
} }
if (myScreen == myBrowser && myBrowser->Main()->Current().type == itDirectory) if (myScreen == myBrowser && !myBrowser->Main()->Empty() && myBrowser->Main()->Current().type == itDirectory)
{ {
std::string old_dir = myBrowser->Main()->Current().name; std::string old_dir = myBrowser->Main()->Current().name;
LockStatusbar(); LockStatusbar();
@@ -1602,7 +1604,15 @@ int main(int argc, char *argv[])
} }
} }
} }
else if (myScreen->ActiveWindow() == myPlaylistEditor->Playlists || (myScreen == myBrowser && myBrowser->Main()->Current().type == itPlaylist)) else if (
(myScreen->ActiveWindow() == myPlaylistEditor->Playlists
&& !myPlaylistEditor->Playlists->Empty()
)
|| (myScreen == myBrowser
&& !myBrowser->Main()->Empty()
&& myBrowser->Main()->Current().type == itPlaylist
)
)
{ {
std::string old_name = myScreen->ActiveWindow() == myPlaylistEditor->Playlists ? myPlaylistEditor->Playlists->Current() : myBrowser->Main()->Current().name; std::string old_name = myScreen->ActiveWindow() == myPlaylistEditor->Playlists ? myPlaylistEditor->Playlists->Current() : myBrowser->Main()->Current().name;
LockStatusbar(); LockStatusbar();