diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-07 10:58:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-07 11:05:21 +0200 |
| commit | 55836370ffb70a34b888f81cdacdfede8fee29cf (patch) | |
| tree | 31c45ae1c3a5e4fcd2284ff4c482a916b5273554 /desktop/win32 | |
| parent | b5ad981518f4407243f89507b2561dd0b1ef28ee (diff) | |
fdo#43989: Revert "win32-dont-attempt-restart.diff: Don't attempt to restart OOo after crash"
This reverts commit f8e1d2438199c4a76ceeb36352678c415e25272c, which erroneously
disabled automatic restart on Windows completely and has now been addressed in a
better way with 150bf2c95c193b30e050ac1c54d64b5485af088d "bnc#524250: Show
backing component after cancelled recovery."
Diffstat (limited to 'desktop/win32')
| -rw-r--r-- | desktop/win32/source/officeloader/officeloader.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index 92a7c38451f4..14c230339121 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -419,7 +419,8 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) CloseHandle( aProcessInfo.hProcess ); CloseHandle( aProcessInfo.hThread ); } - } while ( false ); + } while ( fSuccess + && ( ::desktop::ExitHelper::E_CRASH_WITH_RESTART == dwExitCode || ::desktop::ExitHelper::E_NORMAL_RESTART == dwExitCode )); delete[] lpCommandLine; return fSuccess ? dwExitCode : -1; |