mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed exiting with + button when netloader is active.

Browse Source
This commit is contained in:
yellows8 2018-10-22 22:13:33 -04:00
parent 6d6fb4e3a3
commit ba4c80d76d
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/netloader.c
View File

@ -602,6 +602,8 @@ static bool netloaderGetExit(void) {
} }
void netloaderSignalExit(void) { void netloaderSignalExit(void) {
if (!netloader_initialized) return;
mtx_lock(&netloader_mtx); mtx_lock(&netloader_mtx);
netloader_exitflag = 1; netloader_exitflag = 1;
mtx_unlock(&netloader_mtx); mtx_unlock(&netloader_mtx);

19
nx_main/main.c
View File

@ -64,8 +64,13 @@ int main(int argc, char **argv)
if (R_SUCCEEDED(rc)) powerInit(); if (R_SUCCEEDED(rc)) powerInit();
if (R_SUCCEEDED(rc) && !workerInit()) { if (R_SUCCEEDED(rc) && !netloaderInit()) {
rc = 1; rc = 1;
snprintf(errormsg, sizeof(errormsg)-1, "Error: netloaderInit() failed.");
}
if (R_SUCCEEDED(rc) && !workerInit()) {
rc = 2;
snprintf(errormsg, sizeof(errormsg)-1, "Error: workerInit() failed."); snprintf(errormsg, sizeof(errormsg)-1, "Error: workerInit() failed.");
} }
@ -73,19 +78,14 @@ int main(int argc, char **argv)
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
if (!launchInit()) { if (!launchInit()) {
rc = 2; rc = 3;
snprintf(errormsg, sizeof(errormsg)-1, "Error: launchInit() failed."); snprintf(errormsg, sizeof(errormsg)-1, "Error: launchInit() failed.");
} }
} }
if (R_SUCCEEDED(rc) && !fontInitialize()) { if (R_SUCCEEDED(rc) && !fontInitialize()) {
rc = 3;
snprintf(errormsg, sizeof(errormsg)-1, "Error: fontInitialize() failed.");
}
if (R_SUCCEEDED(rc) && !netloaderInit()) {
rc = 4; rc = 4;
snprintf(errormsg, sizeof(errormsg)-1, "Error: netloaderInit() failed."); snprintf(errormsg, sizeof(errormsg)-1, "Error: fontInitialize() failed.");
} }
#ifdef ENABLE_AUDIO #ifdef ENABLE_AUDIO
@ -169,10 +169,11 @@ int main(int argc, char **argv)
audio_exit(); audio_exit();
#endif #endif
netloaderExit();
fontExit(); fontExit();
launchExit(); launchExit();
netloaderSignalExit();
workerExit(); workerExit();
netloaderExit();
powerExit(); powerExit();
plExit(); plExit();
setsysExit(); setsysExit();

5
pc_main/main.cpp
View File

@ -19,9 +19,9 @@ int main()
themeStartup(THEME_PRESET_LIGHT); themeStartup(THEME_PRESET_LIGHT);
textInit(); textInit();
fontInitialize(); fontInitialize();
netloaderInit();
workerInit(); workerInit();
menuStartup(); menuStartup();
netloaderInit();
while (window.isOpen()) while (window.isOpen())
{ {
@ -54,8 +54,9 @@ int main()
window.display(); window.display();
} }
netloaderExit(); netloaderSignalExit();
workerExit(); workerExit();
netloaderExit();
fontExit(); fontExit();
return 0; return 0;