From 8b175b7044c37e6c1017cb4ebd1da16ad23f912b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Tue, 13 Mar 2012 00:46:58 +0100
Subject: [PATCH] don't exit desktop grid when clicking into empty space

BUG: 244216
REVIEW: 104247
FIXED-IN: 4.9
---
 effects/desktopgrid/desktopgrid.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index c3dcdfe6b4..596fc6b992 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -632,7 +632,10 @@ void DesktopGridEffect::windowInputMouseEvent(Window, QEvent* e)
     if (e->type() == QEvent::MouseButtonRelease && me->button() == Qt::LeftButton) {
         isValidMove = false;
         if (!wasWindowMove && !wasDesktopMove) {
-            setCurrentDesktop(posToDesktop(me->pos()));
+            const int desk = posToDesktop(me->pos());
+            if (desk > effects->numberOfDesktops())
+                return; // don't quit when missing desktop
+            setCurrentDesktop(desk);
             if (windowMove)
                 effects->activateWindow(windowMove);
             setActive(false);