diff options
author | Tor Lillqvist <tml@collabora.com> | 2019-05-21 01:26:53 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2019-05-21 02:32:59 +0300 |
commit | 6d6277f23337c8eae9acabdf830e33fcc3ee9923 (patch) | |
tree | 04f8a9caf55612d0cb371357b29d824e07316ac8 /vcl/source/window/window.cxx | |
parent | 123c7b80447a2b433e19d0d04be444c4dfdd0551 (diff) |
tdf#125397: Avoid crash if GetpApp() returns null, can happen on iOS at least
Change-Id: Ib0dfb00c6a00640fe35769f21f167bf3eae8769b
Diffstat (limited to 'vcl/source/window/window.cxx')
-rw-r--r-- | vcl/source/window/window.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 7435ce177244..c6dc06416c8f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2299,7 +2299,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 ) ) { |