From c247805b28ff13cdfc8c417202d277c440bddf28 Mon Sep 17 00:00:00 2001
From: facugaich <facugaich@gmail.com>
Date: Tue, 1 Sep 2009 18:34:26 +0000
Subject: [PATCH] Linux: Fixed some initialization orders

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4143 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 4 ++--
 Source/Core/DiscIO/Src/NANDContentLoader.cpp     | 6 +++---
 Source/Core/DolphinWX/Src/Frame.cpp              | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
index 0909a0bdba..e77fc2a93c 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
@@ -45,8 +45,8 @@ void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate)
 CEXIMemoryCard::CEXIMemoryCard(const std::string& _rName, const std::string& _rFilename, int _card_index) :
 	m_strFilename(_rFilename),
 	card_index(_card_index),
-	flushThread(NULL),
-	m_bDirty(false)
+	m_bDirty(false),
+	flushThread(NULL)	
 {
 	cards[_card_index] = this;
 	et_this_card = CoreTiming::RegisterEvent(_rName.c_str(), FlushCallback);
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
index 943d567fda..012b660501 100644
--- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
@@ -149,10 +149,10 @@ private:
 
 
 CNANDContentLoader::CNANDContentLoader(const std::string& _rName)
-	: m_TitleID(-1)
-	, m_BootIndex(-1)
-	, m_Valid(false)
+	: m_Valid(false)
+	, m_TitleID(-1)
 	, m_IosVersion(0x09)
+	, m_BootIndex(-1)
 {
 	if (File::IsDirectory(_rName.c_str()))
 	{
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 1dd1b81bbc..0657f3670c 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -308,10 +308,10 @@ CFrame::CFrame(wxFrame* parent,
 		bool ShowLogWindow,
 		long style)
 	: wxFrame(parent, id, title, pos, size, style)	
-	, m_GameListCtrl(NULL), m_pStatusBar(NULL)
-	, m_LogWindow(NULL) , m_Panel(NULL), m_ToolBar(NULL), m_ToolBarDebug(NULL)
-	, bRenderToMain(true), HaveLeds(false), HaveSpeakers(false)
-	, UseDebugger(_UseDebugger), m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0)
+	, m_pStatusBar(NULL), bRenderToMain(true), HaveLeds(false)
+	, HaveSpeakers(false), m_ToolBar(NULL), m_ToolBarDebug(NULL)
+	, UseDebugger(_UseDebugger), m_GameListCtrl(NULL), m_Panel(NULL), m_LogWindow(NULL) 
+	, m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0)
 	#if wxUSE_TIMER
 		, m_timer(this)
 	#endif