aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2019-06-12 15:34:53 +0200
committerGitHub <noreply@github.com>2019-06-12 15:34:53 +0200
commit5c874c4aa97276dd4beee956844bfc6d94a43ed4 (patch)
tree9023c5da1fc03c2c50fefeee6a6d088255969b19
parentc4555965459fdb67c292ade667fd1a934f3bfa5e (diff)
parent2bb7c3300677119d4ab3e8915803371de7079a73 (diff)
Merge pull request #16267 from Rechi/fix/dpms
[fix] is dpms supported check after #13876
-rw-r--r--xbmc/Application.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 0698c52e0b..dcd00a29e8 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -3527,11 +3527,8 @@ void CApplication::CheckScreenSaverAndDPMS()
bool maybeDPMS = true;
if (m_dpmsIsActive)
maybeDPMS = false;
- else if (dpms)
- {
- if (!dpms->IsSupported())
- maybeDPMS = false;
- }
+ else if (!dpms || !dpms->IsSupported())
+ maybeDPMS = false;
else if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(CSettings::SETTING_POWERMANAGEMENT_DISPLAYSOFF) <= 0)
maybeDPMS = false;