diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 00:58:20 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 00:58:20 +1000 |
| commit | f60b3e90e6fd28a543300365b7ad349215a6f849 (patch) | |
| tree | 684cae002507ba6fe58cba058c2da7b888cd2511 /src | |
| parent | 348f5f40d897f2d2e36af2e657467509394e515d (diff) | |
| parent | 611837baec6a32f8c4d88c34f5b96cce15bf3120 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Don't crash if windowmanager is not initialized
Compile fix for 64bit Linux.
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp index 8a8e5a9992..b93e6d2f70 100644 --- a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp +++ b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp @@ -79,6 +79,7 @@ void QWaylandWindowManagerIntegration::wlHandleListenerGlobal(wl_display *displa void QWaylandWindowManagerIntegration::mapClientToProcess(long long processId) { - wl_windowmanager_map_client_to_process(mWaylandWindowManager, (uint32_t) processId); + if (mWaylandWindowManager) + wl_windowmanager_map_client_to_process(mWaylandWindowManager, (uint32_t) processId); } |