Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[New+]Fix for renaming when creating file (#36143)

Browse Source
This commit is contained in:
Christian Gaarden Gaardmark
2024-12-02 07:13:54 -08:00
committed by GitHub
parent 0ee1befe7b
commit db23992aac
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h
View File

@@ -215,10 +215,10 @@ namespace newplus::utilities
inline bool is_desktop_folder(const std::filesystem::path target_fullpath) inline bool is_desktop_folder(const std::filesystem::path target_fullpath)
{ {
TCHAR desktopPath[MAX_PATH]; TCHAR desktop_path[MAX_PATH];
if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, 0, desktopPath))) if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, 0, desktop_path)))
{ {
return StrCmpIW(target_fullpath.c_str(), desktopPath) == 0; return StrCmpIW(target_fullpath.c_str(), desktop_path) == 0;
} }
return false; return false;
} }
@@ -376,8 +376,10 @@ namespace newplus::utilities
// Copy file and determine final filename // Copy file and determine final filename
std::filesystem::path target_final_fullpath = template_entry->copy_object_to(GetActiveWindow(), target_fullpath); std::filesystem::path target_final_fullpath = template_entry->copy_object_to(GetActiveWindow(), target_fullpath);
// Consider copy completed. If we do tracing after enter_rename_mode, then rename mode won't consistently work
trace.UpdateState(true); trace.UpdateState(true);
Trace::EventCopyTemplate(target_final_fullpath.extension().c_str()); Trace::EventCopyTemplate(target_final_fullpath.extension().c_str());
Trace::EventCopyTemplateResult(hr);
trace.Flush(); trace.Flush();
trace.UpdateState(false); trace.UpdateState(false);
@@ -392,13 +394,12 @@ namespace newplus::utilities
Logger::error(ex.what()); Logger::error(ex.what());
hr = S_FALSE; hr = S_FALSE;
trace.UpdateState(true);
Trace::EventCopyTemplateResult(hr);
trace.Flush();
trace.UpdateState(false);
} }
trace.UpdateState(true);
Trace::EventCopyTemplateResult(hr);
trace.Flush();
trace.UpdateState(false);
return hr; return hr;
} }