diff options
author | Abdiel Janulgue <abdiel.janulgue@nokia.com> | 2010-06-30 14:51:46 +0300 |
---|---|---|
committer | Abdiel Janulgue <abdiel.janulgue@nokia.com> | 2010-06-30 14:51:46 +0300 |
commit | b6f79410aa6479073cc95d00bbd5767417d1d353 (patch) | |
tree | a4398bff727536eb1cb84629fe953c988d4ce87e | |
parent | ccc240d5f2319bfac94bd0226865b3a0f341db3d (diff) |
improved null check0.4.10rc2
-rw-r--r-- | src/mcompositemanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp index 2af6dbb..c1b13bd 100644 --- a/src/mcompositemanager.cpp +++ b/src/mcompositemanager.cpp @@ -1738,7 +1738,7 @@ void MCompositeManagerPrivate::mapEvent(XMapEvent *e) } stack_and_return: - if (e->event != QX11Info::appRootWindow()) + if ((e->event != QX11Info::appRootWindow()) || !item) // only handle the MapNotify sent for the root window return; @@ -1761,7 +1761,7 @@ stack_and_return: } /* do this after bindWindow() so that the window is in stacking_list */ - if (item && item->windowState() == NormalState && + if (item->windowState() == NormalState && (stack[DESKTOP_LAYER] != win || !getTopmostApp(0, win))) activateWindow(win, CurrentTime, false); else |