Merge pull request #1012 from Nanquitas/rosalina-freeze-fix

Rosalina: fix freeze when attempting to open Rosalina before the syst…
This commit is contained in:
TuxSH 2018-01-19 01:29:58 +01:00 committed by GitHub
commit e36b27ccf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -148,14 +148,23 @@ void menuThreadMain(void)
else else
N3DSMenu_UpdateStatus(); N3DSMenu_UpdateStatus();
bool isAcURegistered = false;
while(!terminationRequest) while(!terminationRequest)
{ {
if((HID_PAD & menuCombo) == menuCombo) if((HID_PAD & menuCombo) == menuCombo)
{ {
menuEnter(); if (!isAcURegistered)
if(isN3DS) N3DSMenu_UpdateStatus(); isAcURegistered = R_SUCCEEDED(srvIsServiceRegistered(&isAcURegistered, "ac:u"))
menuShow(&rosalinaMenu); && isAcURegistered;
menuLeave();
if (isAcURegistered)
{
menuEnter();
if(isN3DS) N3DSMenu_UpdateStatus();
menuShow(&rosalinaMenu);
menuLeave();
}
} }
svcSleepThread(50 * 1000 * 1000LL); svcSleepThread(50 * 1000 * 1000LL);
} }