From 0af83a41ecb7f06f736e639816392dd7abc6b40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Fri, 18 Apr 2008 14:04:11 +0000 Subject: [PATCH] Don't crash when XGrabKeyboard() fails for some reason. svn path=/trunk/KDE/kdebase/workspace/; revision=798523 --- utils.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils.cpp b/utils.cpp index 695d6abaa2..de949f526d 100644 --- a/utils.cpp +++ b/utils.cpp @@ -298,7 +298,10 @@ bool grabXKeyboard( Window w ) void ungrabXKeyboard() { - assert( keyboard_grabbed ); + if( !keyboard_grabbed ) + { // grabXKeyboard() may fail sometimes, so don't fail, but at least warn anyway + kDebug() << "ungrabXKeyboard() called but keyboard not grabbed!"; + } keyboard_grabbed = false; XUngrabKeyboard( display(), xTime()); }