Index: chrome/browser/first_run/first_run_win.cc |
=================================================================== |
--- chrome/browser/first_run/first_run_win.cc (revision 70414) |
+++ chrome/browser/first_run/first_run_win.cc (working copy) |
@@ -279,15 +279,18 @@ |
BrowserDistribution *dist = BrowserDistribution::GetDistribution(); |
base::win::RegKey key; |
std::wstring rename_cmd; |
- if (key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_READ) && |
- key.ReadValue(google_update::kRegRenameCmdField, &rename_cmd)) { |
- base::ProcessHandle handle; |
- if (base::LaunchApp(rename_cmd, true, true, &handle)) { |
- DWORD exit_code; |
- ::GetExitCodeProcess(handle, &exit_code); |
- ::CloseHandle(handle); |
- if (exit_code == installer::RENAME_SUCCESSFUL) |
- return true; |
+ LONG result = key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_READ); |
+ if (result == ERROR_SUCCESS) { |
+ result = key.ReadValue(google_update::kRegRenameCmdField, &rename_cmd); |
+ if (result == ERROR_SUCCESS) { |
+ base::ProcessHandle handle; |
+ if (base::LaunchApp(rename_cmd, true, true, &handle)) { |
+ DWORD exit_code; |
+ ::GetExitCodeProcess(handle, &exit_code); |
+ ::CloseHandle(handle); |
+ if (exit_code == installer::RENAME_SUCCESSFUL) |
+ return true; |
+ } |
} |
} |