Skip to content

Commit

Permalink
Merge pull request #5651 from rbalint/fix-suspend
Browse files Browse the repository at this point in the history 
Fix suspend with upowerd >= 0.99.1
  • Loading branch information
@topfs2
topfs2 committed Nov 15, 2014
2 parents 7ad1984 + c70fa34 commit 35527b7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions xbmc/powermanagement/PowerManager.cpp
View file
Expand Up @@ -75,12 +75,12 @@ void CPowerManager::Initialize()
m_instance = new CAndroidPowerSyscall();
#elif defined(TARGET_POSIX)
#if defined(HAS_DBUS)
if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
if (CLogindUPowerSyscall::HasLogind())
m_instance = new CLogindUPowerSyscall();
else if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
m_instance = new CConsoleUPowerSyscall();
else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
m_instance = new CConsoleDeviceKitPowerSyscall();
else if (CLogindUPowerSyscall::HasLogind())
m_instance = new CLogindUPowerSyscall();
else if (CUPowerSyscall::HasUPower())
m_instance = new CUPowerSyscall();
else
Expand Down

3 comments on commit 35527b7

@fritsch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes more issues than we thought: http://forum.kodi.tv/showthread.php?tid=209792

It seems distros are not fully prepared to suspend with logind1 yet. We need another method of determining if suspend is possible.

@topfs2
Copy link
Contributor Author

@topfs2 topfs2 commented on 35527b7 Nov 27, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you prepare a revert?

@fritsch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done: #5826

Please sign in to comment.