From 5c560665193a4ffecd36bf2a1b6438db1d1408f1 Mon Sep 17 00:00:00 2001
From: "sl1nk3.s" <sl1nk3.s@gmail.com>
Date: Wed, 8 Apr 2009 16:38:41 +0000
Subject: [PATCH] Fix for issue 831, add .gcz to the cache file of compressed
 iso and corrected fullscreen tool tip message

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2929 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/ISOFile.cpp                |  5 +++++
 Source/Core/DolphinWX/Src/ISOProperties.cpp          |  2 +-
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp        |  2 +-
 Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp |  5 ++---
 Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp      | 10 +++++-----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp
index 426d13cb3b..aaada8f96a 100644
--- a/Source/Core/DolphinWX/Src/ISOFile.cpp
+++ b/Source/Core/DolphinWX/Src/ISOFile.cpp
@@ -172,6 +172,11 @@ std::string GameListItem::CreateCacheFilename()
 {
 	std::string Filename;
 	SplitPath(m_FileName, NULL, &Filename, NULL);
+
+	// We add gcz to the cache file if the file is compressed to avoid it reading
+	// the uncompressed file's cache if it has the same name, but not the same ext.
+	if (DiscIO::IsCompressedBlob(m_FileName.c_str()))
+		Filename.append(".gcz");
 	Filename.append(".cache");
 
 	std::string fullname(FULL_CACHE_DIR);
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index ca9fac7807..59b470f722 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -925,7 +925,7 @@ void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event)
 		break;
 	case ID_ADDCHEAT:
 		{
-			CARCodeAddEdit dlg(-1, this, 1, _("Add AR Code"));
+			CARCodeAddEdit dlg(-1, this, 1, _("Add ActionReplay Code"));
 			if (dlg.ShowModal() == wxID_OK)
 			{
 				Cheats->Append(wxString::FromAscii(arCodes.back().name.c_str()));
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index de8369dd22..3275ebff5c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -283,7 +283,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
         dwStyle = WS_OVERLAPPEDWINDOW;
     }
 
-	RECT rc = {0, 0, s_backbuffer_width, s_backbuffer_height};
+    RECT rc = {0, 0, s_backbuffer_width, s_backbuffer_height};
     AdjustWindowRectEx(&rc, dwStyle, FALSE, dwExStyle);
 
     int X = (rcdesktop.right-rcdesktop.left)/2 - (rc.right-rc.left)/2;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
index e8d09058fd..b261179f25 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
@@ -205,9 +205,8 @@ void ConfigDialog::CreateGUIControls()
 
 	// Tool tips
 	m_Fullscreen->SetToolTip(wxT(
-		"This option use a separate rendering window and can only be used when"
-		" 'Render to main window' is unchecked. The only way to exit this mode\n"
-		" is with Alt + F4 (that also close Dolphin)."
+		"This will create a Fullscreen window using the chosen Fullscreen resolution."
+		"\nPress Esc key to switch between Fullscreen and Windowed mode."
 		));
 	m_NativeResolution->SetToolTip(wxT(
 		"This will use the game's native resolution and stretch it to fill the"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp b/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
index d7046f7465..4c76c8b807 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
@@ -165,16 +165,16 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 				{
 					// Get out of fullscreen
 					g_Config.bFullscreen = false;
-					
+					RECT rc = {0, 0, w_fs, h_fs};
+
 					if (strlen(g_Config.iWindowedRes) > 1)
 						sscanf(g_Config.iWindowedRes, "%dx%d", &w_fs, &h_fs);
-					RECT rcdesktop;
-					RECT rc = {0, 0, w_fs, h_fs};
-					GetWindowRect(GetDesktopWindow(), &rcdesktop);
-
 					// FullScreen -> Desktop
 					ChangeDisplaySettings(NULL, 0);
 
+					RECT rcdesktop;	// Get desktop resolution
+					GetWindowRect(GetDesktopWindow(), &rcdesktop);
+
 					// Re-Enable the cursor
 					ShowCursor(TRUE);