mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-30 23:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix auto window size options when not rendering to main.

Browse source 
Switch gtk keystate_lock back to a recursive mutex.  Now that the mutex attributes are being initialized properly this doesn't seem to cause the segmentation faults anymore.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7349 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-03-15 12:50:58 +00:00
parent f43a8844a2
commit 27142fafe0
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/DolphinWX/Src/Frame.cpp
View file

@ -684,7 +684,6 @@ void CFrame::GetRenderWindowSize(int& x, int& y, int& width, int& height)
void CFrame::OnRenderWindowSizeRequest(int width, int height)
{
if (Core::GetState() == Core::CORE_UNINITIALIZED ||
!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain ||
!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize ||
RendererIsFullscreen() || m_RenderFrame->IsMaximized())
return;
@ -693,8 +692,10 @@ void CFrame::OnRenderWindowSizeRequest(int width, int height)
m_RenderFrame->GetClientSize(&old_width, &old_height);
// Add space for the log/console/debugger window
if ((SConfig::GetInstance().m_InterfaceLogWindow || SConfig::GetInstance().m_InterfaceConsole ||
SConfig::GetInstance().m_InterfaceLogConfigWindow) &&
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain &&
(SConfig::GetInstance().m_InterfaceLogWindow ||
SConfig::GetInstance().m_InterfaceConsole ||
SConfig::GetInstance().m_InterfaceLogConfigWindow) &&
!m_Mgr->GetPane(wxT("Pane 1")).IsFloating())
{
switch (m_Mgr->GetPane(wxT("Pane 1")).dock_direction)