From 01e06a79a5b74877b04836725ff9499299a0a2b0 Mon Sep 17 00:00:00 2001 From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com> Date: Sun, 12 Jan 2025 23:22:20 +0000 Subject: [PATCH] use strstr to find sphaira within update zip, force restart upon update success. --- sphaira/source/ui/menus/main_menu.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sphaira/source/ui/menus/main_menu.cpp b/sphaira/source/ui/menus/main_menu.cpp index 76c9084..da1b210 100644 --- a/sphaira/source/ui/menus/main_menu.cpp +++ b/sphaira/source/ui/menus/main_menu.cpp @@ -89,7 +89,7 @@ auto InstallUpdate(ProgressBox* pbox, const std::string url, const std::string v file_path = fs::AppendPath("/", file_path); } - if (!strcasecmp(strrchr(file_path.s, '/'), "/sphaira.nro")) { + if (std::strstr(file_path, "sphaira.nro")) { file_path = App::GetExePath(); } @@ -279,11 +279,8 @@ MainMenu::MainMenu() { m_update_state = UpdateState::None; App::Notify("Updated to "_i18n + m_update_version); App::Push(std::make_shared( - "Restart Sphaira?"_i18n, - "Back"_i18n, "Restart"_i18n, 1, [this](auto op_index){ - if (op_index && *op_index) { - App::ExitRestart(); - } + "Press OK to restart Sphaira"_i18n, "OK"_i18n, [](auto){ + App::ExitRestart(); } )); } else {