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

actions: require action to be non-null if we query by action type

Browse Source
This commit is contained in:
Andrzej Rybczak
2013-07-13 19:04:22 +02:00
parent fb9df0caee
commit 7167d036d0
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/actions.cpp
View File

@@ -282,11 +282,14 @@ bool isMPDMusicDirSet()
return true;
}
BaseAction *get(Actions::Type at)
BaseAction &get(Actions::Type at)
{
if (AvailableActions.empty())
populateActions();
return AvailableActions[at];
BaseAction *action = AvailableActions[at];
// action should be always present if action type in queried
assert(action != nullptr);
return *action;
}
BaseAction *get(const std::string &name)
@@ -348,9 +351,9 @@ void MouseEvent::run()
) // volume
{
if (m_mouse_event.bstate & BUTTON2_PRESSED)
get(Type::VolumeDown)->execute();
get(Type::VolumeDown).execute();
else
get(Type::VolumeUp)->execute();
get(Type::VolumeUp).execute();
}
else if (m_mouse_event.bstate & (BUTTON1_PRESSED | BUTTON2_PRESSED | BUTTON3_PRESSED | BUTTON4_PRESSED))
myScreen->mouseButtonPressed(m_mouse_event);
@@ -2573,8 +2576,8 @@ void seek()
int old_timeout = wFooter->getTimeout();
wFooter->setTimeout(500);
auto seekForward = Actions::get(Actions::Type::SeekForward);
auto seekBackward = Actions::get(Actions::Type::SeekBackward);
auto seekForward = &Actions::get(Actions::Type::SeekForward);
auto seekBackward = &Actions::get(Actions::Type::SeekBackward);
SeekingInProgress = true;
while (true)