From 070555e59e9d72a886349ec0a7b89eae5d3e26db Mon Sep 17 00:00:00 2001 From: Xavier Vello Date: Tue, 9 Feb 2010 09:54:27 +0000 Subject: [PATCH] Commit patch from SlashDevDsp fixing #223515 crashed kcmkwin/kwindecoration No need to backport to 4.4 svn path=/trunk/KDE/kdebase/workspace/; revision=1087519 --- lib/kdecoration_plugins_p.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp index b5d618d2a3..13da247ccb 100644 --- a/lib/kdecoration_plugins_p.cpp +++ b/lib/kdecoration_plugins_p.cpp @@ -78,8 +78,12 @@ bool KDecorationPlugins::reset( unsigned long changed ) if(( !loadPlugin( "" ) && library ) // "" = read the one in cfg file || oldPlugin == pluginStr ) { // no new plugin loaded, reset the old one - assert( fact != NULL ); + // assert( fact != NULL ); + if(fact != NULL) + { ret = fact->reset( changed ); + } + } return ret || oldPlugin != pluginStr; }