From d05c588ffba6de4be5927ddf5fcd096d9285ec8b Mon Sep 17 00:00:00 2001 From: Matthias Ettrich Date: Tue, 5 Mar 2002 19:02:24 +0000 Subject: [PATCH] part of Karol's fix: keep the old library in loadPlugin() so that updatePlugin() can call the reset() function. svn path=/trunk/kdebase/kwin/; revision=141202 --- plugins.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins.cpp b/plugins.cpp index f1889bdd14..58a313bfe0 100644 --- a/plugins.cpp +++ b/plugins.cpp @@ -75,7 +75,6 @@ Client* PluginMgr::allocateClient(Workspace *ws, WId w, bool tool) bool PluginMgr::loadPlugin(QString nameStr) { KLibrary *oldLibrary = library; - library = 0; QString path = KLibLoader::findLibrary(QFile::encodeName(nameStr)); @@ -90,7 +89,7 @@ bool PluginMgr::loadPlugin(QString nameStr) shutdownKWin(i18n("No window decoration plugin library was found!")); // Check if this library is not already loaded. - if(pluginStr == nameStr) + if(pluginStr == nameStr) return FALSE; // Try loading the requested plugin @@ -140,7 +139,7 @@ bool PluginMgr::loadPlugin(QString nameStr) void PluginMgr::shutdownKWin(const QString &error_msg) { - qWarning( (i18n("KWin: ") + error_msg + + qWarning( (i18n("KWin: ") + error_msg + i18n("\nKWin will now exit...")).latin1() ); exit(1); }