diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2012-02-28 21:09:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 08:58:45 +0100 |
| commit | 740bd815235557336757563823c8d35bf75c6fbf (patch) | |
| tree | 3e6c21c2284bff9409711db43418ac7d82d1b5d3 | |
| parent | f009ee83af38d33299133878f760cbb0e97a9566 (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
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
(cherry picked from commit e532d4932b8a265cc82bf06ef54db58c9b532e38)
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
| -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 72d236fab4fc..f94d6e5acd3c 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -96,8 +96,10 @@ static SalInstance* tryInstance( const OUString& rModuleBase ) /* * #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; } |