Moved XInitThreads to where it wont crash should solve issue 1540 (Thanks emuxperts for the fix)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4603 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
66b80131d6
commit
67dee48b3e
|
@ -713,7 +713,7 @@ void CGameListCtrl::OnKeyPress(wxListEvent& event)
|
||||||
// This shows a little tooltip with the current Game's emulation state
|
// This shows a little tooltip with the current Game's emulation state
|
||||||
void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
|
void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
|
||||||
{
|
{
|
||||||
int flags; long subitem;
|
int flags; long subitem = 0;
|
||||||
long item = HitTest(event.GetPosition(), flags, &subitem);
|
long item = HitTest(event.GetPosition(), flags, &subitem);
|
||||||
static int lastItem = -1;
|
static int lastItem = -1;
|
||||||
|
|
||||||
|
|
|
@ -123,9 +123,6 @@ bool DolphinApp::OnInit()
|
||||||
RegisterMsgAlertHandler(&wxMsgAlert);
|
RegisterMsgAlertHandler(&wxMsgAlert);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined __linux__
|
|
||||||
XInitThreads();
|
|
||||||
#endif
|
|
||||||
// "ExtendedTrace" looks freakin dangerous!!!
|
// "ExtendedTrace" looks freakin dangerous!!!
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
EXTENDEDTRACEINITIALIZE(".");
|
EXTENDEDTRACEINITIALIZE(".");
|
||||||
|
@ -457,6 +454,9 @@ bool DolphinApp::OnInit()
|
||||||
|
|
||||||
// Set main parent window
|
// Set main parent window
|
||||||
SetTopWindow(main_frame);
|
SetTopWindow(main_frame);
|
||||||
|
#if defined __linux__
|
||||||
|
XInitThreads();
|
||||||
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue