diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-04 10:06:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-16 07:59:37 +0000 |
| commit | 4b73386f06f9cea4a23f7e0a0882540e3dd4aa0a (patch) | |
| tree | a264ae7025c01230dd55744e2e84c0d7ee0d01b3 /vcl | |
| parent | 4e3d54fc9542af87d718b24bcd76a0529133f45f (diff) | |
Resolves: tdf#46440 SIGSEGV on toolkit bootstrap without running instance
(cherry picked from commit 3f69547397e5841d0915921be5be8b3edfdfdbc5)
Change-Id: I9a78a75b3d72586b1702ed6fa63bb0b62ce6cd72
Reviewed-on: https://gerrit.libreoffice.org/16078
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 8d99977983be..5ce9477c08dd 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -428,7 +428,8 @@ void Application::AcquireSolarMutex( sal_uLong nCount ) bool Application::IsInMain() { - return ImplGetSVData()->maAppData.mbInAppMain; + ImplSVData* pSVData = ImplGetSVData(); + return pSVData ? pSVData->maAppData.mbInAppMain : false; } bool Application::IsInExecute() |