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

Merge pull request #6407 from leoetlino/master 

Fix render surface when using Render to Main and debugger (regression fix)
This commit is contained in:
JosJuice 2018-02-27 16:13:29 +01:00 committed by GitHub
parent 25a516bae3 1de17d20e1
commit cc7d7c9a49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -603,7 +603,7 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
if (Core::GetState() != Core::State::Uninitialized) if (Core::GetState() != Core::State::Uninitialized)
{ {
int width, height; int width, height;
m_render_frame->GetClientSize(&width, &height); m_render_parent->GetClientSize(&width, &height);
if (!SConfig::GetInstance().bRenderToMain && !RendererIsFullscreen() && if (!SConfig::GetInstance().bRenderToMain && !RendererIsFullscreen() &&
!m_render_frame->IsMaximized() && !m_render_frame->IsIconized()) !m_render_frame->IsMaximized() && !m_render_frame->IsIconized())
{ {