vcl/source/app/salplug.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit fd4bcd5f33fed46cacaa00f90a271b18b6355345
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Jun 11 11:50:39 2021 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Jun 11 16:15:17 2021 +0200
qt5/kf5: Fix crash on exit
This extends the solution from
commit fa8db25af6218262b3dab2e93b76464975889ceb
Date: Thu Jun 3 20:47:10 2021 +0100
gtk4 crash on exit
to cover the qt5/kf5 cases as well, after seeing
equivalent crashes with kf5 VCL plugin
(e.g. when starting Writer and no profile exists) after
commit 556243467a0ac3f647de75bf3fb6c9f3b72466a4
Date: Wed Jun 2 13:06:54 2021 +0200
fix shutdown leak in CppunitTest_sw_filters_test
Change-Id: I4ef25bac0891c059588dbc8e6abe50db14230dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117042
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index 3b48574be7f7..d281b797c5a9 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -107,7 +107,8 @@ SalInstance* tryInstance( const OUString& rModuleBase, bool
bForce = false )
* atk-bridge's atexit handler gets called.
*/
if (aUsedModuleBase == "gtk4" || aUsedModuleBase == "gtk3" ||
- aUsedModuleBase == "gtk3_kde5" || aUsedModuleBase == "win")
+ aUsedModuleBase == "gtk3_kde5" || aUsedModuleBase == "kf5"
||
+ aUsedModuleBase == "qt5" || aUsedModuleBase == "win")
{
pCloseModule = nullptr;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
