diff options
| author | Andrew Branson <abranson@users.noreply.github.com> | 2015-06-10 00:31:11 +0200 |
|---|---|---|
| committer | Andrew Branson <abranson@users.noreply.github.com> | 2015-06-10 00:31:11 +0200 |
| commit | 9f19addbe51a1ceb2967b737843dab0e262343c0 (patch) | |
| tree | 0f3d3d30289256f9485774822d354bb5d5f50f3b /daemon/musicmanager.cpp | |
| parent | 2d50346f06e5be31557cb4718ff94cd650c1a210 (diff) | |
| parent | 882b7b9327edb3dd73fa3e82eba83c0405f91b83 (diff) | |
Merge pull request #1 from smokku/master
Pull
Diffstat (limited to 'daemon/musicmanager.cpp')
| -rw-r--r-- | daemon/musicmanager.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/daemon/musicmanager.cpp b/daemon/musicmanager.cpp index 5ae1786..2a426db 100644 --- a/daemon/musicmanager.cpp +++ b/daemon/musicmanager.cpp @@ -148,11 +148,9 @@ void MusicManager::callMprisMethod(const QString &method) void MusicManager::handleMusicControl(WatchConnector::MusicControl operation) { qCDebug(l) << "operation from watch:" << operation; - QVariant useSystemVolumeVar = settings->property("useSystemVolume"); - bool useSystemVolume = (useSystemVolumeVar.isValid() && useSystemVolumeVar.toBool()); // System volume controls - if (useSystemVolume && _pulseBus != NULL && + if (settings->property("useSystemVolume").toBool() && _pulseBus != NULL && (operation == WatchConnector::musicVOLUME_UP || operation == WatchConnector::musicVOLUME_DOWN)) { // Query current volume QDBusMessage call = QDBusMessage::createMethodCall("com.Meego.MainVolume2", "/com/meego/mainvolume2", |