mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-29 01:20:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UpdaterCommon: Remove manual UI::Stop() calls in favour of a scope guard to ensure it's called on all return paths

Browse Source
This commit is contained in:
Silent 2019-06-24 20:49:18 +02:00
parent 2ae409ba06
commit 3f1ba830e7
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/UpdaterCommon/UpdaterCommon.cpp
View File

@ -16,6 +16,7 @@
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/HttpRequest.h" #include "Common/HttpRequest.h"
#include "Common/ScopeGuard.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "UpdaterCommon/UI.h" #include "UpdaterCommon/UI.h"
@ -498,7 +499,6 @@ void FatalError(const std::string& message)
UI::SetVisible(true); UI::SetVisible(true);
UI::Error(message); UI::Error(message);
UI::Stop();
} }
std::optional<Manifest> ParseManifest(const std::string& manifest) std::optional<Manifest> ParseManifest(const std::string& manifest)
@ -686,6 +686,7 @@ bool RunUpdater(std::vector<std::string> args)
UI::Init(); UI::Init();
UI::SetVisible(false); UI::SetVisible(false);
Common::ScopeGuard ui_guard{[] { UI::Stop(); }};
Options opts = std::move(*maybe_opts); Options opts = std::move(*maybe_opts);
if (opts.log_file) if (opts.log_file)
@ -777,7 +778,5 @@ bool RunUpdater(std::vector<std::string> args)
UI::LaunchApplication(opts.binary_to_restart.value()); UI::LaunchApplication(opts.binary_to_restart.value());
} }
UI::Stop();
return true; return true;
} }