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

settings: make initial slave screen focus optional

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-05-09 16:06:57 +02:00
parent 7d5c5cb20e
commit 043e309e24
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ncmpcpp.cpp
View File

@@ -144,10 +144,16 @@ int main(int argc, char **argv)
// lock current screen and go to the slave one if applicable
if (Config.startup_slave_screen_type)
{
auto slave_screen = *Config.startup_slave_screen_type;
auto slave_screen_type = *Config.startup_slave_screen_type;
bool screen_locked = myScreen->lock();
if (screen_locked && slave_screen != myScreen->type())
toScreen(slave_screen)->switchTo();
if (screen_locked && slave_screen_type != myScreen->type())
{
auto slave_screen = toScreen(slave_screen_type);
assert(slave_screen != nullptr);
slave_screen->switchTo();
if (!Config.startup_slave_screen_focus)
Actions::get(Actions::Type::MasterScreen).execute();
}
}
// local variables