From 8c2f066e018635a74eb3b388c44ac0a2670b4bfc Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Mon, 8 Nov 2010 16:17:47 +0100 Subject: Restart soffice.bin when necessary. In some cases, like when the migration is in progress, or when new extensions are registered, soffice.bin dies with a 'restart' me status. This implements the correct handling of this state in oosplash.bin. --- desktop/source/app/app.cxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'desktop/source/app/app.cxx') diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4bef6e5b3e..9ec6e87883 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1465,7 +1465,11 @@ USHORT Desktop::Exception(USHORT nError) OfficeIPCThread::DisableOfficeIPCThread(); if( pSignalHandler ) osl_removeSignalHandler( pSignalHandler ); + restartOnMac(false); + if ( m_rSplashScreen.is() ) + m_rSplashScreen->reset(); + _exit( ExitHelper::E_CRASH_WITH_RESTART ); } else @@ -1972,6 +1976,9 @@ void Desktop::Main() if ( bRestartRequested ) { restartOnMac(true); + if ( m_rSplashScreen.is() ) + m_rSplashScreen->reset(); + // wouldn't the solution be more clean if SalMain returns the exit code to the system? _exit( ExitHelper::E_NORMAL_RESTART ); } -- cgit v1.2.3