github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't fallback to OpenFolderViaShell (#21749)

Browse Source 
Co-authored-by: Shelley Vohr <codebytere@github.com>
This commit is contained in:
trop[bot]
2020-01-13 14:55:55 +09:00
committed by Cheng Zhao
parent c92efa4ec5
commit ae27218296
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shell/common/platform_util_win.cc
View File

@@ -271,19 +271,15 @@ void ShowItemInFolderOnWorkerThread(const base::FilePath& full_path) {
hr = desktop->ParseDisplayName(NULL, NULL,
const_cast<wchar_t*>(dir.value().c_str()),
NULL, &dir_item, NULL);
if (FAILED(hr)) {
ui::win::OpenFolderViaShell(dir);
if (FAILED(hr))
return;
}
base::win::ScopedCoMem<ITEMIDLIST> file_item;
hr = desktop->ParseDisplayName(
NULL, NULL, const_cast<wchar_t*>(full_path.value().c_str()), NULL,
&file_item, NULL);
if (FAILED(hr)) {
ui::win::OpenFolderViaShell(dir);
if (FAILED(hr))
return;
}
const ITEMIDLIST* highlight[] = {file_item};
hr = SHOpenFolderAndSelectItems(dir_item, base::size(highlight), highlight,
@@ -298,7 +294,6 @@ void ShowItemInFolderOnWorkerThread(const base::FilePath& full_path) {
LOG(WARNING) << " " << __func__ << "(): Can't open full_path = \""
<< full_path.value() << "\""
<< " hr = " << logging::SystemErrorCodeToString(hr);
ui::win::OpenFolderViaShell(dir);
}
}
}