From fde5171e0c1f28eacf9b80eccdfcde13b1af3b30 Mon Sep 17 00:00:00 2001
From: dborth <dborth@ab33defa-829a-11dd-99d6-6900107db72b>
Date: Fri, 20 Feb 2009 09:36:05 +0000
Subject: [PATCH]

---
 source/ngc/vba.cpp   | 19 +++++++++++--------
 source/ngc/video.cpp |  3 ---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/ngc/vba.cpp b/source/ngc/vba.cpp
index 6f70f67..667f336 100644
--- a/source/ngc/vba.cpp
+++ b/source/ngc/vba.cpp
@@ -167,16 +167,22 @@ int main(int argc, char *argv[])
 	#endif
 
 	#ifdef HW_RVL
+	DI_Close();
 	DI_Init();	// first
 	#endif
 
 	InitDeviceThread();
-
-	// Initialise controllers
-	PAD_Init ();
+	VIDEO_Init();
+	PAD_Init();
 
 	#ifdef HW_RVL
 	WPAD_Init();
+	#endif
+
+	InitialiseVideo();
+	ResetVideo_Menu (); // change to menu video mode
+
+	#ifdef HW_RVL
 	// read wiimote accelerometer and IR data
 	WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR);
 	WPAD_SetVRes(WPAD_CHAN_ALL,640,480);
@@ -187,11 +193,6 @@ int main(int argc, char *argv[])
 	SYS_SetResetCallback(ResetCB);
 	#endif
 
-	int selectedMenu = -1;
-
-	InitialiseVideo();
-	ResetVideo_Menu (); // change to menu video mode
-
 	// Initialise freetype font system
 	if (FT_Init ())
 	{
@@ -222,6 +223,8 @@ int main(int argc, char *argv[])
 	if(argc > 0 && argv[0] != NULL)
 		CreateAppPath(argv[0]);
 
+	int selectedMenu = -1;
+
 	// Load preferences
 	if(!LoadPrefs())
 	{
diff --git a/source/ngc/video.cpp b/source/ngc/video.cpp
index 64f1eeb..84ac2f7 100644
--- a/source/ngc/video.cpp
+++ b/source/ngc/video.cpp
@@ -269,9 +269,6 @@ UpdatePadsCB ()
 ****************************************************************************/
 void InitialiseVideo ()
 {
-	/*** Start VIDEO Subsystem ***/
-	VIDEO_Init();
-
 	vmode = VIDEO_GetPreferredMode(NULL);
 
 	switch (vmode->viTVMode >> 2)