[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sfx2/source

[Henry Castro (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d0c90bb1124a4a9f8335bcf8d02cd01ad13c8356
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Mon Mar 29 09:18:07 2021 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Mar 31 10:23:56 2021 +0200

    lok: fix nullptr de-reference
    
    Change-Id: I8a9a7444d66e5e6449a0215bde174253a41f09b3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113317
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    (cherry picked from commit 949085b12a8a57b2257f4e59cc597e4c59b42f76)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113285
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index c132b9e506d0..d8975e1744dd 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -248,7 +248,8 @@ void SidebarController::disposeDecks()
                                                        (hide + "=false").c_str());
         }
 
-        mpParentWindow->ReleaseLOKNotifier();
+        if (mpParentWindow)
+            mpParentWindow->ReleaseLOKNotifier();
     }
 
     mpCurrentDeck.clear();