From 9592da1a9ba32d5574e210df93c36a5913ee0427 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Tue, 13 Apr 2010 04:00:41 +0000
Subject: [PATCH] Save the correct render window size.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5354 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/FrameTools.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 592351f51e..43460f858d 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -692,16 +692,18 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
 	event.Skip();
 	if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
 	{
-		int x, y, width, height;
-		m_RenderParent->GetSize(&width, &height);
-		m_RenderParent->GetPosition(&x, &y);
+		int width, height;
 		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
 				!RendererIsFullscreen() && !m_RenderFrame->IsMaximized())
 		{
+			m_RenderFrame->GetSize(&width, &height);
 			SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth = width;
 			SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight = height;
 		}
 #if defined(HAVE_X11) && HAVE_X11
+		int x, y;
+		m_RenderParent->GetSize(&width, &height);
+		m_RenderParent->GetPosition(&x, &y);
 		X11_SendClientEvent("RESIZE", x, y, width, height);
 #endif
 	}
@@ -847,7 +849,7 @@ void CFrame::DoStop()
 		{
 #ifdef _WIN32
 			if (!RendererIsFullscreen() && !m_RenderFrame->IsMaximized())
-				m_RenderParent->GetSize(&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
+				m_RenderFrame->GetSize(&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
 					&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
 #endif
 			m_RenderFrame->Destroy();