LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Duckbill
2018-01-19 17:38:57 +03:00
parent 1fd689f5da 76d274cfe2
commit 6d4d80a798
11 changed files with 169 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sysmodules/rosalina/source/menus/debugger.c
View File

@@ -69,12 +69,10 @@ void DebuggerMenu_EnableDebugger(void)
bool done = false, alreadyEnabled = gdbServer.super.running;
Result res = 0;
char buf[65];
bool cantStart;
Handle dummy;
bool isSocURegistered;
res = OpenProcessByName("socket", &dummy);
cantStart = R_FAILED(res);
svcCloseHandle(dummy);
res = srvIsServiceRegistered(&isSocURegistered, "soc:U");
isSocURegistered = R_SUCCEEDED(res) && isSocURegistered;
Draw_Lock();
Draw_ClearFramebuffer();
@@ -88,7 +86,7 @@ void DebuggerMenu_EnableDebugger(void)
if(alreadyEnabled)
Draw_DrawString(10, 30, COLOR_WHITE, "Already enabled!");
else if(cantStart)
else if(!isSocURegistered)
Draw_DrawString(10, 30, COLOR_WHITE, "Can't start the debugger before the system has fi-\nnished loading.");
else
{

20
sysmodules/rosalina/source/menus/miscellaneous.c
View File

@@ -258,19 +258,19 @@ void MiscellaneousMenu_InputRedirection(void)
}
else
{
Handle dummy;
s64 dummyInfo;
bool isN3DS = svcGetSystemInfo(&dummyInfo, 0x10001, 0) == 0;
s64 dummyInfo;
bool isN3DS = svcGetSystemInfo(&dummyInfo, 0x10001, 0) == 0;
bool isSocURegistered;
res = OpenProcessByName("socket", &dummy);
cantStart = R_FAILED(res);
svcCloseHandle(dummy);
res = srvIsServiceRegistered(&isSocURegistered, "soc:U");
cantStart = R_FAILED(res) || !isSocURegistered;
if(!cantStart && isN3DS)
{
res = OpenProcessByName("ir", &dummy);
cantStart = R_FAILED(res);
svcCloseHandle(dummy);
bool isIrRstRegistered;
res = srvIsServiceRegistered(&isIrRstRegistered, "ir:rst");
cantStart = R_FAILED(res) || !isIrRstRegistered;
}
}
@@ -285,7 +285,7 @@ void MiscellaneousMenu_InputRedirection(void)
Draw_DrawString(10, 10, COLOR_TITLE, "Miscellaneous options menu");
if(!wasEnabled && cantStart)
Draw_DrawString(10, 30, COLOR_WHITE, "Can't start the debugger before the system has fi-\nnished loading.");
Draw_DrawString(10, 30, COLOR_WHITE, "Can't start the input redirection before the system\nhas finished loading.");
else if(!wasEnabled)
{
Draw_DrawString(10, 30, COLOR_WHITE, "Starting InputRedirection...");