From 55836370ffb70a34b888f81cdacdfede8fee29cf Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 7 Jun 2012 10:58:38 +0200
Subject: 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."
---
 desktop/win32/source/officeloader/officeloader.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'desktop')

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;
-- 
cgit