vcl/unx/generic/plugadapt/salplug.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 740bd815235557336757563823c8d35bf75c6fbf Author: Tomas Chvatal <[email protected]> Date: Tue Feb 28 21:09:08 2012 +0100 Fix crash on exit using KDE interface This is slightly modified version of patch from Lubos Lunak <[email protected]>. This fixes downstream bugs: https://bugs.gentoo.org/show_bug.cgi?id=394533 https://bugs.launchpad.net/bugs/925049 Signed-off-by: Bjoern Michaelsen <[email protected]> (cherry picked from commit e532d4932b8a265cc82bf06ef54db58c9b532e38) Signed-off-by: Stephan Bergmann <[email protected]> diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 72d236f..f94d6e5 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; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
