piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 13:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some segmentation faults with the GCPadNew configuration dialog.

Browse Source 
Also improve the visual appearance in linux.  I think I have done so without hurting the appearance in windows.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5348 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-04-12 20:41:38 +00:00
parent 0b45b3c7a1
commit 448af895d3
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,6 +324,7 @@ CFrame::CFrame(wxFrame* parent,
, m_ToolBar(NULL), m_ToolBarDebug(NULL), m_ToolBarAui(NULL)
, bFloatLogWindow(false), bFloatConsoleWindow(false)
, m_pStatusBar(NULL), m_GameListCtrl(NULL), m_Panel(NULL)
, m_RenderFrame(NULL), m_RenderParent(NULL)
, m_LogWindow(NULL)
, UseDebugger(_UseDebugger), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false)
, m_bControlsCreated(false), m_StopDlg(NULL)
@ -756,10 +757,10 @@ bool CFrame::RendererHasFocus()
#ifdef _WIN32
// Why doesn't the "else" method below work in windows when called from
// Host_RendererHasFocus()?
bRendererHasFocus = (m_RenderParent == wxWindow::FindFocus());
bRendererHasFocus = m_RenderParent && (m_RenderParent == wxWindow::FindFocus());
return bRendererHasFocus;
#else
return m_RenderParent == wxWindow::FindFocus();
return m_RenderParent && (m_RenderParent == wxWindow::FindFocus());
#endif
}