[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/app/salplug.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fa8db25af6218262b3dab2e93b76464975889ceb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 3 20:47:10 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jun 4 09:17:03 2021 +0200

    gtk4 crash on exit
    
    since...
    
    commit 556243467a0ac3f647de75bf3fb6c9f3b72466a4
    Date:   Wed Jun 2 13:06:54 2021 +0200
    
        fix shutdown leak in CppunitTest_sw_filters_test
    
    the vclplug .so is dlclosed and the GtkSalData dtor
    subsequently crashes. gtk3 doesn't crash because its not
    dlclosed.
    
    for a simple life add gtk4 to the list here, probably
    moving delete pSVData->mpSalData before the DestroySalInstance
    or making it part of that is the right way to go
    
    Change-Id: I683fdc217cb3486e3e9029817c8d6207f27bcd6b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116680
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index 41a30c8ed5ec..3b48574be7f7 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -106,7 +106,8 @@ SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false )
                  * So make sure libgtk+ & co are still mapped into memory when
                  * atk-bridge's atexit handler gets called.
                  */
-                if( aUsedModuleBase == "gtk3" || aUsedModuleBase == "gtk3_kde5" || aUsedModuleBase == "win" )
+                if (aUsedModuleBase == "gtk4" || aUsedModuleBase == "gtk3" ||
+                    aUsedModuleBase == "gtk3_kde5" || aUsedModuleBase == "win")
                 {
                     pCloseModule = nullptr;
                 }