diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2021-11-15 17:11:45 +0100 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-11-15 19:44:44 +0100 |
commit | 584934b70de97dcbbb91c5a30a5401f6ed57f29b (patch) | |
tree | e94f9d17e92fe25a986e965f24435a53e18c3586 | |
parent | b6f8611cf9ae565d4cdf8b6d41f444ad63e3502f (diff) |
qt6: Fix crash on exit
Extend the solution from
commit fd4bcd5f33fed46cacaa00f90a271b18b6355345
Date: Fri Jun 11 11:50:39 2021 +0200
qt5/kf5: Fix crash on exit
to qt6 as well, after seeing equivalent crashes there.
Change-Id: If135a60ed4e6302e9ff4fa51cbc12f8b45b797e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125254
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r-- | vcl/source/app/salplug.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx index d2cfc91e3c57..7c2a91cec471 100644 --- a/vcl/source/app/salplug.cxx +++ b/vcl/source/app/salplug.cxx @@ -108,7 +108,8 @@ SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false ) */ if (aUsedModuleBase == "gtk4" || aUsedModuleBase == "gtk3" || aUsedModuleBase == "gtk3_kde5" || aUsedModuleBase == "kf5" || - aUsedModuleBase == "qt5" || aUsedModuleBase == "win") + aUsedModuleBase == "qt5" || aUsedModuleBase == "qt6" || + aUsedModuleBase == "win") { pCloseModule = nullptr; } |