mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 04:08:55 +00:00
added option "render to main window" to opengl video plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@16 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
b503d023bc
commit
ceb924f398
12 changed files with 23 additions and 17 deletions
|
@ -21,7 +21,6 @@
|
|||
#endif
|
||||
#include "GLInit.h"
|
||||
|
||||
|
||||
// Handles OpenGL and the window
|
||||
|
||||
|
||||
|
@ -104,7 +103,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _width, int _height)
|
|||
|
||||
#ifdef _WIN32
|
||||
// create the window
|
||||
if (g_VideoInitialize.pWindowHandle == NULL) {
|
||||
if (!g_Config.renderToMainframe || g_VideoInitialize.pWindowHandle == NULL) {
|
||||
// create the window
|
||||
g_VideoInitialize.pWindowHandle = (void*)EmuWindow::Create(NULL, g_hInstance, "Please wait...");
|
||||
if (g_VideoInitialize.pWindowHandle == NULL) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue