yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

part of Karol's fix: keep the old library in loadPlugin() so that

Browse source 
updatePlugin() can call the reset() function.

svn path=/trunk/kdebase/kwin/; revision=141202
This commit is contained in:
Matthias Ettrich 2002-03-05 19:02:24 +00:00
parent 149b3aad7d
commit d05c588ffb
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins.cpp
View file

@ -75,7 +75,6 @@ Client* PluginMgr::allocateClient(Workspace *ws, WId w, bool tool)
bool PluginMgr::loadPlugin(QString nameStr) bool PluginMgr::loadPlugin(QString nameStr)
{ {
KLibrary *oldLibrary = library; KLibrary *oldLibrary = library;
library = 0;
QString path = KLibLoader::findLibrary(QFile::encodeName(nameStr)); 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!")); shutdownKWin(i18n("No window decoration plugin library was found!"));
// Check if this library is not already loaded. // Check if this library is not already loaded.
if(pluginStr == nameStr) if(pluginStr == nameStr)
return FALSE; return FALSE;
// Try loading the requested plugin // Try loading the requested plugin
@ -140,7 +139,7 @@ bool PluginMgr::loadPlugin(QString nameStr)
void PluginMgr::shutdownKWin(const QString &error_msg) void PluginMgr::shutdownKWin(const QString &error_msg)
{ {
qWarning( (i18n("KWin: ") + error_msg + qWarning( (i18n("KWin: ") + error_msg +
i18n("\nKWin will now exit...")).latin1() ); i18n("\nKWin will now exit...")).latin1() );
exit(1); exit(1);
} }