ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updater: Provide basic user feedback

This commit is contained in:
spycrab 2018-03-27 17:49:36 +02:00
parent ceed6890df
commit 7ce147f4d5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Updater/Main.cpp
View File

@ -624,6 +624,16 @@ bool PerformUpdate(const TodoList& todo, const std::string& install_base_path,
return true; return true;
} }
void FatalError(const std::string& message)
{
auto wide_message = UTF8ToUTF16(message);
MessageBox(nullptr,
(L"A fatal error occured and the updater cannot continue:\n " + wide_message).c_str(),
L"Error", MB_ICONERROR);
fprintf(log_fp, "%s\n", message.c_str());
}
} // namespace } // namespace
int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow)
@ -648,7 +658,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
if (!File::IsDirectory(opts.install_base_path)) if (!File::IsDirectory(opts.install_base_path))
{ {
fprintf(log_fp, "Cannot find install base path, or not a directory.\n"); FatalError("Cannot find install base path, or not a directory.");
return 1; return 1;
} }
@ -666,7 +676,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
std::optional<Manifest> maybe_manifest = FetchAndParseManifest(opts.this_manifest_url); std::optional<Manifest> maybe_manifest = FetchAndParseManifest(opts.this_manifest_url);
if (!maybe_manifest) if (!maybe_manifest)
{ {
fprintf(log_fp, "Could not fetch current manifest. Aborting.\n"); FatalError("Could not fetch current manifest. Aborting.");
return 1; return 1;
} }
this_manifest = std::move(*maybe_manifest); this_manifest = std::move(*maybe_manifest);
@ -674,7 +684,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
maybe_manifest = FetchAndParseManifest(opts.next_manifest_url); maybe_manifest = FetchAndParseManifest(opts.next_manifest_url);
if (!maybe_manifest) if (!maybe_manifest)
{ {
fprintf(log_fp, "Could not fetch next manifest. Aborting.\n"); FatalError("Could not fetch next manifest. Aborting.");
return 1; return 1;
} }
next_manifest = std::move(*maybe_manifest); next_manifest = std::move(*maybe_manifest);
@ -690,7 +700,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
bool ok = PerformUpdate(todo, opts.install_base_path, opts.content_store_url, temp_dir); bool ok = PerformUpdate(todo, opts.install_base_path, opts.content_store_url, temp_dir);
if (!ok) if (!ok)
fprintf(log_fp, "Failed to apply the update.\n"); FatalError("Failed to apply the update.");
CleanUpTempDir(temp_dir, todo); CleanUpTempDir(temp_dir, todo);