diff options
| author | nakeee <nakeee@gmail.com> | 2009-11-23 08:25:41 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-11-23 08:25:41 +0000 |
| commit | 67dee48b3e2b3ab6acdbe210cd135553ef6b990f (patch) | |
| tree | f9e78c63a498061be1b09152da11f3660696149c /Source | |
| parent | 66b80131d6048db5c49d7b247aec47c0304a3de8 (diff) | |
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Src/GameListCtrl.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index a21fa8c394..c5618d179f 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -713,7 +713,7 @@ void CGameListCtrl::OnKeyPress(wxListEvent& event) // This shows a little tooltip with the current Game's emulation state void CGameListCtrl::OnMouseMotion(wxMouseEvent& event) { - int flags; long subitem; + int flags; long subitem = 0; long item = HitTest(event.GetPosition(), flags, &subitem); static int lastItem = -1; diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index b1c11f2784..352dfaf739 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -123,9 +123,6 @@ bool DolphinApp::OnInit() RegisterMsgAlertHandler(&wxMsgAlert); #endif -#if defined __linux__ - XInitThreads(); -#endif // "ExtendedTrace" looks freakin dangerous!!! #ifdef _WIN32 EXTENDEDTRACEINITIALIZE("."); @@ -457,6 +454,9 @@ bool DolphinApp::OnInit() // Set main parent window SetTopWindow(main_frame); +#if defined __linux__ + XInitThreads(); +#endif return true; } |