diff --git a/src/apps/mediaplayer/Controller.cpp b/src/apps/mediaplayer/Controller.cpp index e4504337e2..4cf977e9a8 100644 --- a/src/apps/mediaplayer/Controller.cpp +++ b/src/apps/mediaplayer/Controller.cpp @@ -35,6 +35,7 @@ #include "AutoDeleter.h" #include "ControllerView.h" +#include "MainApp.h" #include "PlaybackState.h" #include "Settings.h" #include "VideoView.h" @@ -332,22 +333,23 @@ Controller::PlayerActivated(bool active) { BAutolock _(this); - if (active) { + if (active && gMainApp->PlayerCount() > 1) { if (fActiveVolume != fVolume) SetVolume(fActiveVolume); } else { fActiveVolume = fVolume; - switch (fBackgroundMovieVolumeMode) { - case mpSettings::BG_MOVIES_MUTED: - SetVolume(0.0); - break; - case mpSettings::BG_MOVIES_HALF_VLUME: - SetVolume(fVolume * 0.25); - break; - case mpSettings::BG_MOVIES_FULL_VOLUME: - default: - break; - } + if (gMainApp->PlayerCount() > 1) + switch (fBackgroundMovieVolumeMode) { + case mpSettings::BG_MOVIES_MUTED: + SetVolume(0.0); + break; + case mpSettings::BG_MOVIES_HALF_VLUME: + SetVolume(fVolume * 0.25); + break; + case mpSettings::BG_MOVIES_FULL_VOLUME: + default: + break; + } } } diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp index b7fc65096d..d775d4d002 100644 --- a/src/apps/mediaplayer/MainWin.cpp +++ b/src/apps/mediaplayer/MainWin.cpp @@ -701,7 +701,7 @@ MainWin::WindowActivated(bool active) MoveBy(diffX, diffY); } - fController->PlayerActivated(active || gMainApp->PlayerCount() <= 1); + fController->PlayerActivated(active); }