summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-06-04 10:06:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-06-04 11:10:10 +0100
commit3f69547397e5841d0915921be5be8b3edfdfdbc5 (patch)
tree10f778cf3c4dcd21cdf7a5814d4210e773049862 /vcl
parent407c6c871ea53d9fb97c50e1ee24db7a8e5d70e1 (diff)
Resolves: tdf#46440 SIGSEGV on toolkit bootstrap without running instance
Change-Id: I9a78a75b3d72586b1702ed6fa63bb0b62ce6cd72
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/svapp.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 34bc5505404b..bf358735f56a 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -418,7 +418,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()