Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Corrected nullptr crash on Windows when going to sleep

Browse Source
This commit is contained in:
Jonathan White 2017-05-06 22:14:53 -04:00 committed by thez3ro
parent 8ddd0b2f6f
commit 147c000ef1
No known key found for this signature in database
GPG Key ID: F628F9E41DD7C073
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/ScreenLockListenerWin.cpp
View File

@ -45,14 +45,19 @@ bool ScreenLockListenerWin::nativeEventFilter(const QByteArray &eventType, void
if (eventType == "windows_generic_MSG" || eventType == "windows_dispatcher_MSG") { if (eventType == "windows_generic_MSG" || eventType == "windows_dispatcher_MSG") {
MSG* m = static_cast<MSG *>(message); MSG* m = static_cast<MSG *>(message);
if (m->message == WM_POWERBROADCAST) { if (m->message == WM_POWERBROADCAST) {
if (m->wParam == PBT_POWERSETTINGCHANGE) {
const POWERBROADCAST_SETTING* setting = reinterpret_cast<const POWERBROADCAST_SETTING*>(m->lParam); const POWERBROADCAST_SETTING* setting = reinterpret_cast<const POWERBROADCAST_SETTING*>(m->lParam);
if (setting->PowerSetting == GUID_LIDSWITCH_STATE_CHANGE) { if (setting != nullptr && setting->PowerSetting == GUID_LIDSWITCH_STATE_CHANGE) {
const DWORD* state = reinterpret_cast<const DWORD*>(&setting->Data); const DWORD* state = reinterpret_cast<const DWORD*>(&setting->Data);
if (*state == 0) { if (*state == 0) {
Q_EMIT screenLocked(); Q_EMIT screenLocked();
return true; return true;
} }
} }
} else if (m->wParam == PBT_APMSUSPEND) {
Q_EMIT screenLocked();
return true;
}
} }
if (m->message == WM_WTSSESSION_CHANGE) { if (m->message == WM_WTSSESSION_CHANGE) {
if (m->wParam == WTS_CONSOLE_DISCONNECT) { if (m->wParam == WTS_CONSOLE_DISCONNECT) {