ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Fixed some initialization orders 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4143 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
facugaich 2009-09-01 18:34:26 +00:00
parent 6168ab75c6
commit c247805b28
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
View File

@ -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);

6
Source/Core/DiscIO/Src/NANDContentLoader.cpp
View File

@ -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()))
{

8
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -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