diff options
author | Adam Endrodi <ext-adam.endrodi@nokia.com> | 2011-01-24 19:50:13 +0200 |
---|---|---|
committer | Adam Endrodi <ext-adam.endrodi@nokia.com> | 2011-01-25 12:06:56 +0200 |
commit | 1dd2bc2500aed06c163272598a3ecbed4d49fa2c (patch) | |
tree | 640ba34bff3f5261e8f174b589c8305f826e2b9f | |
parent | 36a1307df55f239f6869ca78a1a03bfe5f40311b (diff) |
destroy unused property cache
We left an unused MWindowPropertyCache in prop_caches, causing the
Q_ASSERT() failure hidden by 21bee47953a85736892fca5b2339c8f5a86047bf.
* src/mcompositemanager.cpp (MCompositeManagerPrivate::mapEvent):
Delete wpc if after all we don't wish to manage the window.
-rw-r--r-- | src/mcompositemanager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp index ae8924b..ea47567 100644 --- a/src/mcompositemanager.cpp +++ b/src/mcompositemanager.cpp @@ -2433,9 +2433,12 @@ void MCompositeManagerPrivate::mapEvent(XMapEvent *e) } stack_and_return: - if (!pc || (e->event != QX11Info::appRootWindow()) || !item) + if (!pc || (e->event != QX11Info::appRootWindow()) || !item) { // only handle the MapNotify sent for the root window + prop_caches.remove(win); + delete wpc; return; + } bool stacked = false; if (configure_reqs.contains(win)) { |