diff options
author | Tony Wasserka <neobrainx@gmail.com> | 2015-05-23 14:01:06 +0200 |
---|---|---|
committer | Tony Wasserka <neobrainx@gmail.com> | 2015-05-23 14:01:06 +0200 |
commit | 5f193bbf068c8b4bf2a9200b696a574c5e1e5784 (patch) | |
tree | 23f0949dd21de0ef563e5cad68a1be917c7afca1 /src | |
parent | 1c2135415944c76a04a21814b86ec8500da39031 (diff) | |
parent | c9244a03c701fa8e274c8500795fe1f6c1b27830 (diff) |
Merge pull request #806 from yuriks/annoying-qt-warning
Qt: Silence a bogus warning printed when using the debug runtime
Diffstat (limited to 'src')
-rw-r--r-- | src/citra_qt/bootmanager.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index ea46bb1da..72b55e94d 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -138,7 +138,13 @@ void GRenderWindow::moveContext() void GRenderWindow::SwapBuffers() { - // MakeCurrent is already called in renderer_opengl +#if !defined(QT_NO_DEBUG) + // Qt debug runtime prints a bogus warning on the console if you haven't called makeCurrent + // since the last time you called swapBuffers. This presumably means something if you're using + // QGLWidget the "regular" way, but in our multi-threaded use case is harmless since we never + // call doneCurrent in this thread. + child->makeCurrent(); +#endif child->swapBuffers(); } |