From b7d6259405d8acce302dab74297004d906a94454 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Tue, 15 Sep 2009 06:14:45 +0000
Subject: [PATCH] Videcommon: removed double settings (how did full/window res
 work so far?)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4272 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/Core.cpp               |  1 +
 Source/Core/DebuggerWX/Src/CodeWindow.cpp   | 10 ----------
 Source/Core/VideoCommon/Src/VideoConfig.cpp |  8 ++++----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 10accf89a5..02a4750bb3 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -205,6 +205,7 @@ bool Init()
 	emuThreadGoing.Init();
 	// This will execute EmuThread() further down in this file
 	g_EmuThread = new Common::Thread(EmuThread, NULL);
+	
 	emuThreadGoing.MsgWait();
 	emuThreadGoing.Shutdown();
 
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
index a27d7767fc..98e9d0b2f1 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
@@ -197,8 +197,6 @@ void CCodeWindow::OnKeyDown(wxKeyEvent& event)
 
 void CCodeWindow::OnHostMessage(wxCommandEvent& event)
 {
-	return;
-
 	switch (event.GetId())
 	{
 	    case IDM_NOTIFYMAPLOADED:
@@ -388,7 +386,6 @@ void CCodeWindow::UpdateLists()
 
 void CCodeWindow::UpdateCallstack()
 {
-	return;
 	//if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return;
 	//if (Core::GetState() == Core::CORE_STOPPING) return;
 
@@ -629,7 +626,6 @@ bool CCodeWindow::JITBlockLinking()
 }
 
 
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Toolbar
 void CCodeWindow::InitBitmaps()
 {
@@ -670,16 +666,10 @@ void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar)
 	// the changes
 	toolBar->Realize();
 }
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Update GUI
-
 void CCodeWindow::Update()
 {
-	return;
-
 	if (!codeview) return;
 
 	codeview->Refresh();
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 5ea67d0e44..df54fa146a 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -95,9 +95,9 @@ void VideoConfig::Load(const char *ini_file)
 	iniFile.Get("Hardware", "Adapter", &iAdapter, 0);
 	if (iAdapter == -1) 
 		iAdapter = 0;
-	iniFile.Get("Hardware", "WindowedRes", &iWindowedRes, 0);
+	//	iniFile.Get("Hardware", "WindowedRes", &iWindowedRes, 0);
 	iniFile.Get("Hardware", "VSync", &bVsync, 0);
-	iniFile.Get("Hardware", "FullscreenRes", &iFSResolution, 0);
+	//	iniFile.Get("Hardware", "FullscreenRes", &iFSResolution, 0);
 	iniFile.Get("Hardware", "SimpleFB", &bSimpleFB, false);
 
 	// Load common settings
@@ -174,9 +174,9 @@ void VideoConfig::Save(const char *ini_file)
 	iniFile.Set("Hacks", "ProjectionHack", iPhackvalue);
 
 	iniFile.Set("Hardware", "Adapter", iAdapter);
-	iniFile.Set("Hardware", "WindowedRes", iWindowedRes);
+	//	iniFile.Set("Hardware", "WindowedRes", iWindowedRes);
 	iniFile.Set("Hardware", "VSync", bVsync);
-	iniFile.Set("Hardware", "FullscreenRes", iFSResolution);
+	//	iniFile.Set("Hardware", "FullscreenRes", iFSResolution);
 	iniFile.Set("Hardware", "SimpleFB", bSimpleFB);
 
     iniFile.Save(ini_file);