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

[Tor Lillqvist (via logerrit)]

 vcl/source/window/window.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0b1cb77806227a9d998f857dbe404a3de9f1bbde
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue May 21 01:26:53 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 13:59:34 2019 +0200

    tdf#125397: Avoid crash if GetpApp() returns null, can happen on iOS at least
    
    Change-Id: Ib0dfb00c6a00640fe35769f21f167bf3eae8769b
    (cherry picked from commit 30b8d352bdfd2128769f3ae1e8a3616118d3e754)
    Reviewed-on: https://gerrit.libreoffice.org/79214
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5f66921a23aa..b75793329981 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2314,7 +2314,9 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
             if ( !pSVData->mpIntroWindow )
             {
                 // The right way would be just to call this (not even in the 'if')
-                GetpApp()->InitFinished();
+                auto pApp = GetpApp();
+                if ( pApp )
+                    pApp->InitFinished();
             }
             else if ( !ImplIsWindowOrChild( pSVData->mpIntroWindow ) )
             {