diff options
| author | Lasse Holmstedt <lasse.holmstedt@nokia.com> | 2011-05-19 16:30:44 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-19 16:54:12 +0200 |
| commit | 611837baec6a32f8c4d88c34f5b96cce15bf3120 (patch) | |
| tree | aaf1043a670711600f14e7a0c948207e09b91f0a /src/plugins | |
| parent | ac0eef5d64f14f228f78acfbaf58981a6c32f7e5 (diff) | |
Don't crash if windowmanager is not initialized
This can happen if there is e.g. no wayland server.
Reviewed-by: sroedal
(cherry picked from commit aea5e35f57d061b133d2fa613d10f5e0118f5706)
Diffstat (limited to 'src/plugins')
| -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); } |