From b5b4d9284664853971b34a7f3a1a2a23490fe7e4 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Mon, 18 Jan 2010 18:21:27 +0000
Subject: [PATCH] Change the order so selected iso will be first and only then
 the default iso. Some other minor cleanup

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4880 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/AudioCommon/Src/Mixer.h         |  2 +-
 Source/Core/DolphinWX/Src/FrameAui.cpp      |  5 -----
 Source/Core/DolphinWX/Src/FrameTools.cpp    | 19 +++++++++----------
 Source/Core/DolphinWX/Src/ISOProperties.cpp |  2 +-
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h
index 4f8ca421ac..bf82047bfd 100644
--- a/Source/Core/AudioCommon/Src/Mixer.h
+++ b/Source/Core/AudioCommon/Src/Mixer.h
@@ -74,9 +74,9 @@ protected:
 	bool m_throttle;
 
 	short m_buffer[MAX_SAMPLES * 2];
+	volatile u32 m_numSamples;
 	u32 m_indexW;
 	u32 m_indexR;
-	volatile u32 m_numSamples;
 
 private:
 
diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp
index a3c7914f22..a51196dc2a 100644
--- a/Source/Core/DolphinWX/Src/FrameAui.cpp
+++ b/Source/Core/DolphinWX/Src/FrameAui.cpp
@@ -16,11 +16,6 @@
 // http://code.google.com/p/dolphin-emu/
 
 
-// Why doesn't it work on windows?
-#ifndef _WIN32
-#include "Common.h"
-#endif
-
 #include "Setup.h" // Common
 
 #if defined(HAVE_SFML) && HAVE_SFML || defined(_WIN32)
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index bd46ff68b9..1841ec03ed 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -467,12 +467,11 @@ void CFrame::InitBitmaps()
 
 
 // Menu items
-// ---------------------
 
 // Start the game or change the disc.
 // Boot priority:
-// 1. Default ISO
-// 2. Show the game list and boot the selected game.
+// 1. Show the game list and boot the selected game.
+// 2. Default ISO
 // 3. Boot last selected game
 void CFrame::BootGame()
 {
@@ -481,18 +480,18 @@ void CFrame::BootGame()
 	if (Core::GetState() != Core::CORE_UNINITIALIZED)
 		return;
 
+	// Start the selected ISO, or try one of the saved paths.
+	// If all that fails, ask to add a dir and don't boot
+	if (m_GameListCtrl->GetSelectedISO() != NULL)
+	{
+		if (m_GameListCtrl->GetSelectedISO()->IsValid())
+			BootManager::BootCore(m_GameListCtrl->GetSelectedISO()->GetFileName());
+	}
 	else if (!StartUp.m_strDefaultGCM.empty()
 		&&	wxFileExists(wxString(StartUp.m_strDefaultGCM.c_str(), wxConvUTF8)))
 	{
 		BootManager::BootCore(StartUp.m_strDefaultGCM);
 	}
-	// Start the selected ISO, or try one of the saved paths.
-	// If all that fails, ask to add a dir and don't boot
-	else if (m_GameListCtrl->GetSelectedISO() != NULL)
-	{
-		if (m_GameListCtrl->GetSelectedISO()->IsValid())
-			BootManager::BootCore(m_GameListCtrl->GetSelectedISO()->GetFileName());
-	}
 	else
 	{
 		if (!SConfig::GetInstance().m_LastFilename.empty()
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index b6f14eafe6..385bf0c183 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -777,7 +777,7 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
 	}
 
 	if (!ret)
-		PanicAlert("Failed to extract to %s!", Path.mb_str());
+		PanicAlert("Failed to extract to %s!", (const char *)Path.mb_str());
 }
 
 void CISOProperties::SetRefresh(wxCommandEvent& event)