From 2bbef42c378551339b4655deef75824e258c0f34 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 13 Mar 2010 15:49:40 +0000 Subject: [PATCH] Fix an issue in linux where if both render to main and fullscreen are checked the emulator started in fullscreen with the wrong window size. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5193 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index ecb8b872de..1ab4635bd8 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -693,13 +693,13 @@ void OpenGL_Update() if ((ulong) event.xclient.data.l[0] == XInternAtom(GLWin.dpy, "TOGGLE_FULLSCREEN", False)) ToggleFullscreenMode(); #if defined(HAVE_GTK2) && HAVE_GTK2 && defined(wxGTK) - if (g_Config.RenderToMainframe && + if (g_Config.RenderToMainframe && !GLWin.fs && (ulong) event.xclient.data.l[0] == XInternAtom(GLWin.dpy, "MAIN_RESIZED", False)) { GLWin.panel->GetSize((int *)&GLWin.width, (int *)&GLWin.height); XResizeWindow(GLWin.dpy, GLWin.win, GLWin.width, GLWin.height); } - if (g_Config.RenderToMainframe && + if (g_Config.RenderToMainframe && !GLWin.fs && (ulong) event.xclient.data.l[0] == XInternAtom(GLWin.dpy, "WINDOW_REFOCUS", False)) XSetInputFocus(GLWin.dpy, GLWin.win, RevertToPointerRoot, CurrentTime); #endif