From 59e48748ae3e4d163b2cd9df8169695167ca8370 Mon Sep 17 00:00:00 2001
From: Pablo Curiel <pabloacurielz@gmail.com>
Date: Wed, 25 Jul 2018 21:57:44 -0400
Subject: [PATCH] Some minor (trivial) changes.

Nothing too substantial. Just committing them before going to Spain.
---
 source/fsext.h |  3 ---
 source/main.c  | 16 +++++++++++-----
 source/ui.c    |  6 +++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/source/fsext.h b/source/fsext.h
index b2b3d14..5ce6567 100644
--- a/source/fsext.h
+++ b/source/fsext.h
@@ -15,7 +15,4 @@ Result fsDeviceOperatorIsGameCardInserted(FsDeviceOperator* d, bool* out);
 Result fsDeviceOperatorGetGameCardHandle(FsDeviceOperator* d, u32* out);
 Result fsDeviceOperatorUpdatePartitionInfo(FsDeviceOperator* d, u32 handle, u32* out_title_version, u64* out_title_id);
 
-// FsStorage
-Result fsStorageGetSize(FsStorage* s, u64* out);
-
 #endif
diff --git a/source/main.c b/source/main.c
index 141603c..dd51219 100644
--- a/source/main.c
+++ b/source/main.c
@@ -78,9 +78,10 @@ int main(int argc, char **argv)
 										if (getGameCardTitleIDAndVersion(&gameCardTitleID, &gameCardVersion))
 										{
 											convertTitleVersionToDecimal(gameCardVersion, gameCardVersionStr, sizeof(gameCardVersionStr));
-											getGameCardControlNacp(gameCardTitleID, gameCardName, sizeof(gameCardName), gameCardAuthor, sizeof(gameCardAuthor));
-											strtrim(gameCardName);
 											
+											getGameCardControlNacp(gameCardTitleID, gameCardName, sizeof(gameCardName), gameCardAuthor, sizeof(gameCardAuthor));
+											
+											strtrim(gameCardName);
 											if (strlen(gameCardName))
 											{
 												snprintf(fixedGameCardName, sizeof(fixedGameCardName) / sizeof(fixedGameCardName[0]), "%s", gameCardName);
@@ -192,6 +193,7 @@ int main(int argc, char **argv)
 					} else {
 						snprintf(strbuf, sizeof(strbuf) / sizeof(strbuf[0]), "Failed to initialize the time service! (0x%08X)", result);
 						uiDrawString(strbuf, 0, 0, 255, 255, 255);
+						syncDisplay();
 						delay(5);
 						ret = -5;
 					}
@@ -200,6 +202,7 @@ int main(int argc, char **argv)
 				} else {
 					snprintf(strbuf, sizeof(strbuf) / sizeof(strbuf[0]), "Failed to initialize the ns service! (0x%08X)", result);
 					uiDrawString(strbuf, 0, 0, 255, 255, 255);
+					syncDisplay();
 					delay(5);
 					ret = -4;
 				}
@@ -208,6 +211,7 @@ int main(int argc, char **argv)
 			} else {
 				snprintf(strbuf, sizeof(strbuf) / sizeof(strbuf[0]), "Failed to initialize the ncm service! (0x%08X)", result);
 				uiDrawString(strbuf, 0, 0, 255, 255, 255);
+				syncDisplay();
 				delay(5);
 				ret = -3;
 			}
@@ -216,6 +220,7 @@ int main(int argc, char **argv)
 		} else {
 			snprintf(strbuf, sizeof(strbuf) / sizeof(strbuf[0]), "Failed to open device operator! (0x%08X)", result);
 			uiDrawString(strbuf, 0, 0, 255, 255, 255);
+			syncDisplay();
 			delay(5);
 			ret = -2;
 		}
@@ -224,6 +229,7 @@ int main(int argc, char **argv)
 	} else {
 		snprintf(strbuf, sizeof(strbuf) / sizeof(strbuf[0]), "Failed to initialize the fsp-srv service! (0x%08X)", result);
 		uiDrawString(strbuf, 0, 0, 255, 255, 255);
+		syncDisplay();
 		delay(5);
 		ret = -1;
 	}
@@ -231,10 +237,10 @@ int main(int argc, char **argv)
 	if (hfs0_header != NULL) free(hfs0_header);
 	
 	//if (partitionHfs0Header != NULL) free(partitionHfs0Header);
-	
+
 	uiDeinit();
 	
-    gfxExit();
+	gfxExit();
 	
-    return ret;
+	return ret;
 }
diff --git a/source/ui.c b/source/ui.c
index 68fa9f6..a4e5eb0 100644
--- a/source/ui.c
+++ b/source/ui.c
@@ -237,6 +237,7 @@ void uiDrawString(const char* string, int x, int y, u8 r, u8 g, u8 b)
 void uiStatusMsg(const char* format, ...)
 {
 	statusMessageFadeout = 1000;
+	
 	va_list args;
 	va_start(args, format);
 	vsnprintf(statusMessage, sizeof(statusMessage) / sizeof(statusMessage[0]), format, args);
@@ -249,9 +250,12 @@ void uiUpdateStatusMsg()
 {
 	if (!strlen(statusMessage) || !statusMessageFadeout) return;
 	
-	int fadeout = (statusMessageFadeout > 255 ? 255 : statusMessageFadeout);
 	uiFill(0, currentFBHeight - 12, currentFBWidth, 8, 50, 50, 50);
+	
+	int fadeout = (statusMessageFadeout > 255 ? 255 : statusMessageFadeout);
 	uiDrawString(statusMessage, 4, currentFBHeight - 12, fadeout, fadeout, fadeout);
+	syncDisplay();
+	
 	statusMessageFadeout -= 4;
 }