Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-23 19:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor(updating): update async methods to use std::expected and co_await"

Browse Source 
This reverts commit 743feb7ce3.
This commit is contained in:
Gordon Lam (SH)
2026-02-05 15:13:53 -08:00
parent 743feb7ce3
commit 45f3e1debb
4 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/runner/UpdateUtils.cpp
View File

@@ -173,9 +173,7 @@ void ProcessNewVersionInfo(const github_version_info& version_info,
// Cleanup old updates before downloading the latest
updating::cleanup_updates();
std::optional<std::filesystem::path> downloaded_installer;
download_new_version(new_version_info, downloaded_installer).get();
if (downloaded_installer)
if (download_new_version(new_version_info))
{
state.state = UpdateState::readyToInstall;
state.downloadedInstallerFilename = new_version_info.installer_filename;
@@ -234,12 +232,7 @@ void PeriodicUpdateWorker()
bool version_info_obtained = false;
try
{
#if USE_STD_EXPECTED
std::expected<github_version_info, std::wstring> new_version_info;
#else
nonstd::expected<github_version_info, std::wstring> new_version_info;
#endif
get_github_version_info_async(false, new_version_info).get();
const auto new_version_info = get_github_version_info_async();
if (new_version_info.has_value())
{
version_info_obtained = true;
@@ -279,12 +272,7 @@ void CheckForUpdatesCallback()
auto state = UpdateState::read();
try
{
#if USE_STD_EXPECTED
std::expected<github_version_info, std::wstring> new_version_info;
#else
nonstd::expected<github_version_info, std::wstring> new_version_info;
#endif
get_github_version_info_async(false, new_version_info).get();
auto new_version_info = get_github_version_info_async();
if (!new_version_info)
{
// We couldn't get a new version from github for some reason, log error