summaryrefslogtreecommitdiff
path: root/desktop/win32
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2010-09-14 14:42:40 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2010-09-14 14:42:40 +0200
commit150b71f82c682889427a3df2accee6cc44d85ccb (patch)
tree953ae1ae27e2c6a2a617e749083b02c25d5c7b85 /desktop/win32
parentc6eb9605babcd5621b77a3c12a977fed3a84c742 (diff)
win32-dont-attempt-restart.diff: Don't attempt to restart OOo after crash
n#524250 Don't attempt to restart soffice.bin immediately if it crashes. At such a restart, if the document recovery dialog is cancelled, an empty Writer document is opened even if the user was editing some other kind of document. Some customers are annoyed by this. And the automatic restart doesn't work on Linux anyway, so for consistency it doesn't hurt if we force it not to work on Windows, either.
Diffstat (limited to 'desktop/win32')
-rw-r--r--desktop/win32/source/officeloader/officeloader.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 42a152e6c4..58967406ed 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -417,8 +417,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
CloseHandle( aProcessInfo.hProcess );
CloseHandle( aProcessInfo.hThread );
}
- } while ( fSuccess
- && ( ::desktop::ExitHelper::E_CRASH_WITH_RESTART == dwExitCode || ::desktop::ExitHelper::E_NORMAL_RESTART == dwExitCode ));
+ } while ( false );
delete[] lpCommandLine;
return fSuccess ? dwExitCode : -1;