Mirrors/Awoo-Installer
2
0
Fork 0
mirror of https://github.com/Huntereb/Awoo-Installer synced 2025-02-17 04:08:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make URL entries just return to the same screen if canceled

Browse source
This commit is contained in:
Huntereb 2019-11-09 10:36:44 -05:00
parent 3078db6cbf
commit 38baa513c4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/ui/netInstPage.cpp
View file

@ -87,14 +87,14 @@ namespace inst::ui {
if (R_SUCCEEDED(rc) && tmpoutstr[0] != 0) { if (R_SUCCEEDED(rc) && tmpoutstr[0] != 0) {
if (inst::util::formatUrlString(tmpoutstr) == "" || tmpoutstr == (char *)"https://" || tmpoutstr == (char *)"http://") { if (inst::util::formatUrlString(tmpoutstr) == "" || tmpoutstr == (char *)"https://" || tmpoutstr == (char *)"http://") {
mainApp->CreateShowDialog("The URL specified is invalid!", "", {"OK"}, false); mainApp->CreateShowDialog("The URL specified is invalid!", "", {"OK"}, false);
mainApp->LoadLayout(mainApp->mainPage); netInstPage::startNetwork();
return; return;
} }
netInstPage::selectedUrls = {tmpoutstr}; netInstPage::selectedUrls = {tmpoutstr};
netInstPage::startInstall(true); netInstPage::startInstall(true);
return; return;
} else { } else {
mainApp->LoadLayout(mainApp->mainPage); netInstPage::startNetwork();
return; 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); } 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; if (dialogResult == -1 && !urlMode) return;
else if (dialogResult == -1 && urlMode) { else if (dialogResult == -1 && urlMode) {
mainApp->LoadLayout(mainApp->mainPage); netInstPage::startNetwork();
return; return;
} }
netInstStuff::installNspLan(netInstPage::selectedUrls, dialogResult); netInstStuff::installNspLan(netInstPage::selectedUrls, dialogResult);