From 8a21f92f0bca8b0f1161a3d6b2417cef69dea9f0 Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Mon, 25 Jul 2011 17:50:03 +0000
Subject: [PATCH] USB Loader GX *Properly sync video after flush to avoid
 possible green flash *Moved argument command line also to mem2 to avoid
 overwrite of it

Forwarder V4:
*Changed to new app_booter method (see WiiXplorer SVN)
*Properly sync video after flush to avoid possible green flash
*Centered background image and corrected aspect ratio
---
 HBC/META.XML                         |  4 ++--
 source/homebrewboot/BootHomebrew.cpp | 12 +++++-------
 source/video.cpp                     |  3 +++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index e9d73031..2eb4b867 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.2 r1102</version>
-		<release_date>201107231948</release_date>
+		<version>2.2 r1103</version>
+		<release_date>201107241629</release_date>
         <!--   // remove this line to enable arguments
         <arguments>
                 <arg>--ios=250</arg>
diff --git a/source/homebrewboot/BootHomebrew.cpp b/source/homebrewboot/BootHomebrew.cpp
index 81805bb3..42833600 100644
--- a/source/homebrewboot/BootHomebrew.cpp
+++ b/source/homebrewboot/BootHomebrew.cpp
@@ -57,6 +57,8 @@ static int SetupARGV(struct __argv * args)
     bzero(args, sizeof(struct __argv));
     args->argvMagic = ARGV_MAGIC;
 
+    u32 argc = 0;
+    u32 position = 0;
     u32 stringlength = 1;
 
     /** Append Arguments **/
@@ -66,12 +68,8 @@ static int SetupARGV(struct __argv * args)
     }
 
     args->length = stringlength;
-    args->commandLine = (char*) malloc(args->length);
-
-    if (!args->commandLine) return -1;
-
-    u32 argc = 0;
-    u32 position = 0;
+	//! Put the argument into mem2 too, to avoid overwriting it
+	args.commandLine = (char *) ARGS_ADDR + sizeof(struct __argv);
 
     /** Append Arguments **/
     for (u32 i = 0; i < Arguments.size(); i++)
@@ -114,7 +112,7 @@ static int RunAppbooter()
 	if (args.argvMagic == ARGV_MAGIC)
 	{
 		memmove(ARGS_ADDR, &args, sizeof(args));
-		DCFlushRange(ARGS_ADDR, sizeof(args));
+		DCFlushRange(ARGS_ADDR, sizeof(args) + args.length);
 	}
 
     u64 currentStub = getStubDest();
diff --git a/source/video.cpp b/source/video.cpp
index 27cc4d35..a3a608be 100644
--- a/source/video.cpp
+++ b/source/video.cpp
@@ -179,6 +179,9 @@ void StopGX()
 
     VIDEO_SetBlack(TRUE);
     VIDEO_Flush();
+	VIDEO_WaitVSync();
+	if (vmode->viTVMode & VI_NON_INTERLACE)
+		VIDEO_WaitVSync();
 }
 
 /****************************************************************************