From 87a984a40aa5379724d909de866fc108a1faeab0 Mon Sep 17 00:00:00 2001
From: dborth <dborth@d154fe42-be53-0410-aac0-356034171556>
Date: Tue, 17 Mar 2009 06:28:17 +0000
Subject: [PATCH]

---
 source/ngc/menu.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp
index 2383326..6f6a1e3 100644
--- a/source/ngc/menu.cpp
+++ b/source/ngc/menu.cpp
@@ -717,13 +717,13 @@ static void WindowCredits(void * ptr)
 	txt[i] = new GuiText("Snes9x Team");
 	txt[i]->SetPosition(320,y); i++; y+=24;
 
-	txt[i] = new GuiText("Armin Tamzarian");
-	txt[i]->SetPosition(50,y); i++;
-	txt[i] = new GuiText("FreeTypeGX");
-	txt[i]->SetPosition(320,y); i++; y+=24;
 	txt[i] = new GuiText("libogc / devkitPPC");
 	txt[i]->SetPosition(50,y); i++;
 	txt[i] = new GuiText("shagkur & wintermute");
+	txt[i]->SetPosition(320,y); i++; y+=24;
+	txt[i] = new GuiText("FreeTypeGX");
+	txt[i]->SetPosition(50,y); i++;
+	txt[i] = new GuiText("Armin Tamzarian");
 	txt[i]->SetPosition(320,y); i++; y+=48;
 
 	txt[i]->SetPresets(18, (GXColor){0, 0, 0, 255}, 0,
@@ -773,6 +773,13 @@ static void WindowCredits(void * ptr)
 		}
 	}
 
+	// clear buttons pressed
+	for(i=0; i < 4; i++)
+	{
+		userInput[i].wpad.btns_d = 0;
+		userInput[i].pad.btns_d = 0;
+	}
+
 	for(i=0; i < numEntries; i++)
 		delete txt[i];
 }
@@ -3262,11 +3269,14 @@ MainMenu (int menu)
 	GuiImage logoImg(&logo);
 	GuiImageData logoOver(logo_over_png);
 	GuiImage logoImgOver(&logoOver);
+	GuiText logoTxt(APPVERSION, 18, (GXColor){255, 255, 255, 255});
+	logoTxt.SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
 	btnLogo = new GuiButton(logoImg.GetWidth(), logoImg.GetHeight());
 	btnLogo->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
 	btnLogo->SetPosition(-30, 30);
 	btnLogo->SetImage(&logoImg);
 	btnLogo->SetImageOver(&logoImgOver);
+	btnLogo->SetLabel(&logoTxt);
 	btnLogo->SetTrigger(&trigA);
 	btnLogo->SetUpdateCallback(WindowCredits);