diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2012-02-28 21:09:08 +0100 |
|---|---|---|
| committer | Tomas Chvatal <tchvatal@suse.cz> | 2012-02-28 21:09:08 +0100 |
| commit | 24f4cd9983aa2bc9d642c40a8fef19d7fe7b98a6 (patch) | |
| tree | 9979ab0773abe14738111b3b7a1e3199b2ddd3b9 /vcl | |
| parent | ac08d3f6967b241d6028d9cd17cce583ac72871e (diff) | |
Fix crash on exit using KDE interface
This is slightly modified version of patch from Lubos Lunak
<llunak@suse.cz>.
This fixes downstream bugs:
https://bugs.gentoo.org/show_bug.cgi?id=394533
https://bugs.launchpad.net/bugs/925049
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 1d9a5baa540e..eb9e90cd1b5b 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -99,8 +99,10 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals /* * #i109007# KDE3 seems to have the same problem; an atexit cleanup * handler, which cannot be resolved anymore if the plugin is already unloaded. + * Same applies for kde4. */ - else if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) ) + else if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) || + rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) ) { pCloseModule = NULL; } |