diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-22 22:16:44 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-22 22:16:44 +0000 |
| commit | cb910e336663dd63a35f2721c50419b0fdc1500e (patch) | |
| tree | c68bdb8ba9ffe562777cc21065cb1b9419b28d9c /chrome/app/chrome_exe_main.cc | |
| parent | a60637ef856d2befff63e38fe46a48feef7e27dc (diff) | |
| download | chromium_src-cb910e336663dd63a35f2721c50419b0fdc1500e.zip chromium_src-cb910e336663dd63a35f2721c50419b0fdc1500e.tar.gz chromium_src-cb910e336663dd63a35f2721c50419b0fdc1500e.tar.bz2 | |
Set the default flag to know if we should restart the process
on crash to "False", so if we fail to display the message box,
we wont restart it.
BUG:7900
Review URL: http://codereview.chromium.org/27023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_exe_main.cc')
| -rw-r--r-- | chrome/app/chrome_exe_main.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/app/chrome_exe_main.cc b/chrome/app/chrome_exe_main.cc index 6399198..3065597 100644 --- a/chrome/app/chrome_exe_main.cc +++ b/chrome/app/chrome_exe_main.cc @@ -55,7 +55,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev_instance, // Initialize the crash reporter. InitCrashReporter(client.GetDLLPath()); - bool exit_now = false; + bool exit_now = true; if (ShowRestartDialogIfCrashed(&exit_now)) { // We have restarted because of a previous crash. The user might // decide that he does not want to continue. @@ -88,6 +88,14 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev_instance, // Initialize the crash reporter. InitCrashReporter(client_util::GetDLLPath(dll_name, dll_path)); + bool exit_now = true; + if (ShowRestartDialogIfCrashed(&exit_now)) { + // We have restarted because of a previous crash. The user might + // decide that he does not want to continue. + if (exit_now) + return ResultCodes::NORMAL_EXIT; + } + if (NULL != dll_handle) { client_util::DLL_MAIN entry = reinterpret_cast<client_util::DLL_MAIN>( ::GetProcAddress(dll_handle, "ChromeMain")); |