Merge commit 'refs/merge-requests/43' of git@gitorious.org:meegotouch/meegotouch-compositor

1 files changed, 7 insertions, 0 deletions

diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp
index 499a05a..aa85f39 100644
--- a/src/mcompositemanager.cpp
+++ b/src/mcompositemanager.cpp
@@ -2388,6 +2388,13 @@ void MCompositeManagerPrivate::clientMessageEvent(XClientMessageEvent *event)
                 d_item->setZValue(i->zValue() - 1);
 
                 Window lower, topmost = getTopmostApp();
+                if (i->window() != topmost) {
+                    /* Request from a background app.  Don't do anything,
+                     * just make sure the states are not screwed. */
+                    i->stopPing();
+                    setWindowState(i->window(), IconicState);
+                    return;
+                }
                 if (topmost)
                     lower = topmost;
                 else