From 16fbba3c2a21bf92e9dd6d17c89da9bccf339691 Mon Sep 17 00:00:00 2001
From: tfarley <tfarleygithub@gmail.com>
Date: Mon, 18 May 2015 21:24:43 -0700
Subject: MakeCurrent race condition fix

---
 src/citra_qt/bootmanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/citra_qt/bootmanager.cpp')

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index ab9403007..ea46bb1da 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -28,11 +28,11 @@
 
 EmuThread::EmuThread(GRenderWindow* render_window) :
     exec_step(false), running(false), stop_run(false), render_window(render_window) {
-
-    connect(this, SIGNAL(started()), render_window, SLOT(moveContext()));
 }
 
 void EmuThread::run() {
+    render_window->MakeCurrent();
+
     stop_run = false;
 
     // holds whether the cpu was running during the last iteration,
-- 
cgit v1.2.3