diff options
| author | mirandac@google.com <mirandac@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-03 19:45:01 +0000 |
|---|---|---|
| committer | mirandac@google.com <mirandac@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-03 19:45:01 +0000 |
| commit | b09f15c499dfbfa8c88a1941b9023f1651e0710d (patch) | |
| tree | ddd8b8159d8de3a6818bb233d9435933a1e58b80 /chrome/browser/importer | |
| parent | f8e7b62dd159148eccfc779d599300e27fdf8a0d (diff) | |
| download | chromium_src-b09f15c499dfbfa8c88a1941b9023f1651e0710d.zip chromium_src-b09f15c499dfbfa8c88a1941b9023f1651e0710d.tar.gz chromium_src-b09f15c499dfbfa8c88a1941b9023f1651e0710d.tar.bz2 | |
Reusing the RegKey used to get the CurrentVersion to also get the Install Directory was causing an InvalidHandle exception, and causing FF import to fail.
BUG=45730
TEST= FF import should work.
Review URL: http://codereview.chromium.org/2581002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/firefox_importer_utils_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/importer/firefox_importer_utils_win.cc b/chrome/browser/importer/firefox_importer_utils_win.cc index 548ecd1..77e3fcb 100644 --- a/chrome/browser/importer/firefox_importer_utils_win.cc +++ b/chrome/browser/importer/firefox_importer_utils_win.cc @@ -52,9 +52,9 @@ std::wstring GetFirefoxInstallPathFromRegistry() { return std::wstring(); registry_path += L"\\" + std::wstring(buffer) + L"\\Main"; buffer_length = sizeof(buffer); - reg_key = RegKey(HKEY_LOCAL_MACHINE, registry_path.c_str()); - result = reg_key.ReadValue(L"Install Directory", buffer, - &buffer_length, NULL); + RegKey reg_key_directory = RegKey(HKEY_LOCAL_MACHINE, registry_path.c_str()); + result = reg_key_directory.ReadValue(L"Install Directory", buffer, + &buffer_length, NULL); if (!result) return std::wstring(); return buffer; |