diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-02-10 17:54:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-10 20:30:26 +0100 |
| commit | 97d8e3b2007abf7b14b4ccbfbbc4abdeef712bcf (patch) | |
| tree | 3b2b22138d9c5ab24fda2906411f427ec265c0a7 /src/plugins/platforms/windows/qwindowscontext.cpp | |
| parent | d61e7743078197f7409e863ff1d2243da7d0335f (diff) | |
Windows: Fix return value of WM_QUERYENDSESSION.
LRESULT should be non-zero if the application can quit,
and it is always handled.
Task-number: QTBUG-35986
Change-Id: Ic8b0ecc731d3efaf94e2a62491918d379fe59f5c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowscontext.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowscontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 8380aba13b..b69ec1e30f 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -969,7 +969,8 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message, if (lParam & ENDSESSION_LOGOFF) fflush(NULL); - return !sessionManager->wasCanceled(); + *result = sessionManager->wasCanceled() ? 0 : 1; + return true; } case QtWindows::EndSessionApplicationEvent: { QWindowsSessionManager *sessionManager = platformSessionManager(); |