diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-21 02:56:54 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-21 02:56:54 +0000 |
| commit | 7834880925f91d845283babece4a020bdb80d505 (patch) | |
| tree | aeca258bef9d41723186c4036e8bfc10e0fa2633 /Source/Plugins/Plugin_VideoSoftware | |
| parent | 46844174090fb659228539e34cfdc95faed5963a (diff) | |
Make sure the game list gets created with automatic starts.
When rendering to the main window, the wxGLCanvas should really
be owned by the DolphinWX code for it to be safely freed.
Hack around the problem by just hiding the canvas for now.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6890 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp index d62ce2e630..d34ac78c16 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp @@ -296,7 +296,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight bool OpenGL_MakeCurrent() { #if defined(USE_WX) && USE_WX - GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); + return GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); #elif defined(_WIN32) return wglMakeCurrent(hDC,hRC) ? true : false; #elif defined(HAVE_X11) && HAVE_X11 @@ -383,6 +383,7 @@ void OpenGL_Update() void OpenGL_Shutdown() { #if defined(USE_WX) && USE_WX + GLWin.glCanvas->Hide(); delete GLWin.glCtxt; #elif defined(_WIN32) if (hRC) // Do We Have A Rendering Context? |