@@ -253,6 +253,9 @@ void Workspace::finishCompositing() } delete popup; // force re-creation of the Alt+F3 popup (opacity option) popup = NULL; + // discard all Deleted windows (#152914) + while( !deleted.isEmpty()) + deleted.first()->discard( Allowed ); #endif } composite.cpp @@ -48,6 +48,13 @@ Deleted* Deleted::create( Toplevel* c ) return d; } +// to be used only from Workspace::finishCompositing() +void Deleted::discard( allowed_t ) + { + delete_refcount = 0; + delete this; + } + void Deleted::copyToDeleted( Toplevel* c ) { assert( dynamic_cast< Deleted* >( c ) == NULL ); deleted.cpp @@ -35,6 +35,7 @@ class Deleted // used by effects to keep the window around for e.g. fadeout effects when it's destroyed void refWindow(); void unrefWindow( bool delay = false ); + void discard( allowed_t ); virtual int desktop() const; virtual QPoint clientPos() const; virtual QSize clientSize() const; deleted.h 065a1d99274fdb74d867bd18f637f81c6f6a486d Luboš Luňák l.lunak@kde.org http://github.com/Zarin/kwin/commit/8ad3deddc67aacd5d8c33f8c8a992375791faa0d 8ad3deddc67aacd5d8c33f8c8a992375791faa0d 2008-07-28T04:49:43-07:00 2008-07-28T04:49:43-07:00 Discard Deleted windows when finishing compositing, so that they're not reused if compositing is started again. BUG: 152914 git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdebase/workspace/kwin@838646 283d02a7-25f6-0310-bc7c-ecb5cbfe19da 051b9107132e5009c1ef7f7283be008f300fab90 Luboš Luňák l.lunak@kde.org