From 38baa513c420dd92367ed3fba4fc7a4a6acd8771 Mon Sep 17 00:00:00 2001 From: Huntereb Date: Sat, 9 Nov 2019 10:36:44 -0500 Subject: [PATCH] Make URL entries just return to the same screen if canceled --- source/ui/netInstPage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/ui/netInstPage.cpp b/source/ui/netInstPage.cpp index c67b047..0236a72 100755 --- a/source/ui/netInstPage.cpp +++ b/source/ui/netInstPage.cpp @@ -87,14 +87,14 @@ namespace inst::ui { if (R_SUCCEEDED(rc) && tmpoutstr[0] != 0) { if (inst::util::formatUrlString(tmpoutstr) == "" || tmpoutstr == (char *)"https://" || tmpoutstr == (char *)"http://") { mainApp->CreateShowDialog("The URL specified is invalid!", "", {"OK"}, false); - mainApp->LoadLayout(mainApp->mainPage); + netInstPage::startNetwork(); return; } netInstPage::selectedUrls = {tmpoutstr}; netInstPage::startInstall(true); return; } else { - mainApp->LoadLayout(mainApp->mainPage); + netInstPage::startNetwork(); return; } } @@ -114,7 +114,7 @@ namespace inst::ui { } else dialogResult = mainApp->CreateShowDialog("Where should the selected " + std::to_string(netInstPage::selectedUrls.size()) + " files be installed to?", "Press B to cancel", {"SD Card", "Internal Storage"}, false); if (dialogResult == -1 && !urlMode) return; else if (dialogResult == -1 && urlMode) { - mainApp->LoadLayout(mainApp->mainPage); + netInstPage::startNetwork(); return; } netInstStuff::installNspLan(netInstPage::selectedUrls, dialogResult);