Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CFrame: Only re-assign focus when "Render to main" is enabled. #710

Merged
merged 1 commit into from Aug 4, 2014

Conversation

CrossVR
Copy link
Contributor

@CrossVR CrossVR commented Aug 1, 2014

It may cause fullscreen loops and since m_RenderFrame == m_RenderParent now it's not necessary to re-assign focus anymore.

No longer conflicts with PR #683, that PR has been rewritten.

It may cause fullscreen loops and since m_RenderFrame == m_RenderParent now it's not necessary to re-assign focus anymore.
@CrossVR
Copy link
Contributor Author

CrossVR commented Aug 3, 2014

The if statement was too broad, changed it to only cover the focus re-assignment.

@lioncash
Copy link
Member

lioncash commented Aug 3, 2014

Looks good to me

#ifdef __WXMSW__
::SetFocus((HWND)m_RenderParent->GetHandle());
::SetFocus((HWND)m_RenderParent->GetHandle());
#else

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

lioncash added a commit that referenced this pull request Aug 4, 2014
CFrame: Only re-assign focus when "Render to main" is enabled.
@lioncash lioncash merged commit 1515262 into dolphin-emu:master Aug 4, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants