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

autoupdate: handle exceptions in download_update (#5324)

Browse Source
This commit is contained in:
Andrey Nekrasov
2020-07-30 18:32:50 +03:00
committed by GitHub
parent 7799783c9a
commit de67fff731
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/runner/main.cpp
View File

@@ -40,6 +40,7 @@ const wchar_t EXPLORER_PROCESS_NAME[] = L"explorer.exe";
namespace localized_strings namespace localized_strings
{ {
const wchar_t MSI_VERSION_IS_ALREADY_RUNNING[] = L"An older version of PowerToys is already running."; const wchar_t MSI_VERSION_IS_ALREADY_RUNNING[] = L"An older version of PowerToys is already running.";
const wchar_t DOWNLOAD_UPDATE_ERROR[] = L"Couldn't download PowerToys update! Please report the issue on Github.";
const wchar_t OLDER_MSIX_UNINSTALLED[] = L"An older MSIX version of PowerToys was uninstalled."; const wchar_t OLDER_MSIX_UNINSTALLED[] = L"An older MSIX version of PowerToys was uninstalled.";
const wchar_t PT_UPDATE_MESSAGE_BOX_TEXT[] = L"PowerToys was updated and some components require Windows Explorer to restart. Do you want to restart Windows Explorer now?"; const wchar_t PT_UPDATE_MESSAGE_BOX_TEXT[] = L"PowerToys was updated and some components require Windows Explorer to restart. Do you want to restart Windows Explorer now?";
} }
@@ -233,14 +234,26 @@ toast_notification_handler_result toast_notification_handler(const std::wstring_
} }
else if (param.starts_with(download_and_install_update)) else if (param.starts_with(download_and_install_update))
{ {
std::wstring installer_filename = updating::download_update().get(); try
{
std::wstring installer_filename = updating::download_update().get();
std::wstring args{ UPDATE_NOW_LAUNCH_STAGE1_CMDARG }; std::wstring args{ UPDATE_NOW_LAUNCH_STAGE1_CMDARG };
args += L' '; args += L' ';
args += installer_filename; args += installer_filename;
launch_action_runner(args.c_str()); launch_action_runner(args.c_str());
return toast_notification_handler_result::exit_success; return toast_notification_handler_result::exit_success;
}
catch (...)
{
MessageBoxW(nullptr,
localized_strings::DOWNLOAD_UPDATE_ERROR,
L"PowerToys",
MB_ICONWARNING | MB_OK);
return toast_notification_handler_result::exit_error;
}
} }
else else
{ {