From 847bb129e9dc0663a108a173bc4560834b65c576 Mon Sep 17 00:00:00 2001 From: fincs Date: Sat, 31 Oct 2020 19:13:24 +0100 Subject: [PATCH] Use diagAbortWithResult instead of fatalThrow --- graphics/deko3d/deko_console/source/startup.c | 2 +- .../deko_examples/source/SampleFramework/startup.cpp | 2 +- graphics/shared_font/source/main.c | 2 +- hid/irsensor/source/main.c | 2 +- templates/sysmodule/source/main.c | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/graphics/deko3d/deko_console/source/startup.c b/graphics/deko3d/deko_console/source/startup.c index ede2c9c..bd023b7 100644 --- a/graphics/deko3d/deko_console/source/startup.c +++ b/graphics/deko3d/deko_console/source/startup.c @@ -4,7 +4,7 @@ void userAppInit(void) { Result res = romfsInit(); if (R_FAILED(res)) - fatalThrow(res); + diagAbortWithResult(res); } void userAppExit(void) diff --git a/graphics/deko3d/deko_examples/source/SampleFramework/startup.cpp b/graphics/deko3d/deko_examples/source/SampleFramework/startup.cpp index fa8b3a1..1b8c94b 100644 --- a/graphics/deko3d/deko_examples/source/SampleFramework/startup.cpp +++ b/graphics/deko3d/deko_examples/source/SampleFramework/startup.cpp @@ -15,7 +15,7 @@ extern "C" void userAppInit(void) { Result res = romfsInit(); if (R_FAILED(res)) - fatalThrow(res); + diagAbortWithResult(res); #ifdef DEBUG_NXLINK socketInitializeDefault(); diff --git a/graphics/shared_font/source/main.c b/graphics/shared_font/source/main.c index 01ff2a9..1c32d95 100644 --- a/graphics/shared_font/source/main.c +++ b/graphics/shared_font/source/main.c @@ -134,7 +134,7 @@ void userAppInit(void) rc = plInitialize(PlServiceType_User); if (R_FAILED(rc)) - fatalThrow(rc); + diagAbortWithResult(rc); LanguageCode = getSystemLanguage(); } diff --git a/hid/irsensor/source/main.c b/hid/irsensor/source/main.c index ddc8030..e9cb7aa 100644 --- a/hid/irsensor/source/main.c +++ b/hid/irsensor/source/main.c @@ -17,7 +17,7 @@ void userAppInit(void) rc = irsInitialize(); if (R_FAILED(rc)) - fatalThrow(rc); + diagAbortWithResult(rc); } void userAppExit(void) diff --git a/templates/sysmodule/source/main.c b/templates/sysmodule/source/main.c index 8503434..1da7c0b 100644 --- a/templates/sysmodule/source/main.c +++ b/templates/sysmodule/source/main.c @@ -37,23 +37,23 @@ void __attribute__((weak)) __appInit(void) // Initialize default services. rc = smInitialize(); if (R_FAILED(rc)) - fatalThrow(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM)); + diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM)); // Enable this if you want to use HID. /*rc = hidInitialize(); if (R_FAILED(rc)) - fatalThrow(MAKERESULT(Module_Libnx, LibnxError_InitFail_HID));*/ + diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_InitFail_HID));*/ //Enable this if you want to use time. /*rc = timeInitialize(); if (R_FAILED(rc)) - fatalThrow(MAKERESULT(Module_Libnx, LibnxError_InitFail_Time)); + diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_InitFail_Time)); __libnx_init_time();*/ rc = fsInitialize(); if (R_FAILED(rc)) - fatalThrow(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS)); + diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS)); fsdevMountSdmc(); }