From ca588cb0e5ca55257c1fe8b2eec6e893815f1f94 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Thu, 4 Jul 2024 17:22:06 +0200
Subject: [PATCH] Improve OSFatal/logging messages

---
 source/MenuUtils.cpp       | 12 ++++++------
 source/PairUtils.cpp       |  4 ++--
 source/QuickStartUtils.cpp |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/MenuUtils.cpp b/source/MenuUtils.cpp
index 93382f3..7a9220f 100644
--- a/source/MenuUtils.cpp
+++ b/source/MenuUtils.cpp
@@ -110,7 +110,7 @@ void drawMenuScreen(const std::map<uint32_t, std::string> &menu, uint32_t select
 int32_t handleMenuScreen(std::string &configPath, int32_t autobootOptionInput, const std::map<uint32_t, std::string> &menu) {
     auto screenBuffer = DrawUtils::InitOSScreen();
     if (!screenBuffer) {
-        OSFatal("Failed to alloc memory for screen");
+        OSFatal("AutobootModule: Failed to alloc memory for screen");
     }
 
     uint32_t tvBufferSize  = OSScreenGetBufferSizeEx(SCREEN_TV);
@@ -118,7 +118,7 @@ int32_t handleMenuScreen(std::string &configPath, int32_t autobootOptionInput, c
 
     DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize);
     if (!DrawUtils::initFont()) {
-        OSFatal("Failed to init font");
+        OSFatal("AutobootModule: Failed to init font");
     }
 
     int32_t selectedIndex = autobootOptionInput > 0 ? autobootOptionInput : 0;
@@ -225,7 +225,7 @@ int32_t handleMenuScreen(std::string &configPath, int32_t autobootOptionInput, c
 nn::act::SlotNo handleAccountSelectScreen(const std::vector<std::shared_ptr<AccountInfo>> &data) {
     auto screenBuffer = DrawUtils::InitOSScreen();
     if (!screenBuffer) {
-        OSFatal("Failed to alloc memory for screen");
+        OSFatal("AutobootModule: Failed to alloc memory for screen");
     }
 
     uint32_t tvBufferSize  = OSScreenGetBufferSizeEx(SCREEN_TV);
@@ -233,7 +233,7 @@ nn::act::SlotNo handleAccountSelectScreen(const std::vector<std::shared_ptr<Acco
 
     DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize);
     if (!DrawUtils::initFont()) {
-        OSFatal("Failed to init font");
+        OSFatal("AutobootModule: Failed to init font");
     }
 
     int32_t selected = 0;
@@ -403,7 +403,7 @@ void handleUpdateWarningScreen() {
 
     auto screenBuffer = DrawUtils::InitOSScreen();
     if (!screenBuffer) {
-        OSFatal("Failed to alloc memory for screen");
+        OSFatal("AutobootModule: Failed to alloc memory for screen");
     }
 
     uint32_t tvBufferSize  = OSScreenGetBufferSizeEx(SCREEN_TV);
@@ -411,7 +411,7 @@ void handleUpdateWarningScreen() {
 
     DrawUtils::initBuffers(screenBuffer, tvBufferSize, (void *) ((uint32_t) screenBuffer + tvBufferSize), drcBufferSize);
     if (!DrawUtils::initFont()) {
-        OSFatal("Failed to init font");
+        OSFatal("AutobootModule: Failed to init font");
     }
 
     {
diff --git a/source/PairUtils.cpp b/source/PairUtils.cpp
index 51c53f9..ca90f6d 100644
--- a/source/PairUtils.cpp
+++ b/source/PairUtils.cpp
@@ -105,7 +105,7 @@ PairMenu::PairMenu() {
     mIMHandle = IM_Open();
     if (mIMHandle < 0) {
         DEBUG_FUNCTION_LINE_ERR("PairMenu: IM_Open failed");
-        OSFatal("PairMenu: IM_Open failed");
+        OSFatal("AutobootModule: PairMenu: IM_Open failed");
     }
     mIMRequest = (IMRequest *) memalign(0x40, sizeof(IMRequest));
 
@@ -114,7 +114,7 @@ PairMenu::PairMenu() {
 
     if (!mIMRequest || !mIMCancelRequest) {
         DEBUG_FUNCTION_LINE_ERR("Failed to allocate im request");
-        OSFatal("PairMenu: Failed to allocate im request");
+        OSFatal("AutobootModule: PairMenu: Failed to allocate im request");
     }
 
     mIMEventMask = IM_EVENT_SYNC;
diff --git a/source/QuickStartUtils.cpp b/source/QuickStartUtils.cpp
index 50f15cf..d7767d2 100644
--- a/source/QuickStartUtils.cpp
+++ b/source/QuickStartUtils.cpp
@@ -157,7 +157,7 @@ public:
             // The gamepad does reconnect after selecting a title, make sure it's still disconnected after waiting 3 seconds
             OSSleepTicks(OSSecondsToTicks(3));
             if (!IsDRCConnected()) {
-                DEBUG_FUNCTION_LINE("GamePad was disconnected, lets abort the quick start menu");
+                DEBUG_FUNCTION_LINE_INFO("GamePad was disconnected, lets abort the quick start menu");
                 CCRSysCaffeineBootCheckAbort();
             }
         }