summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-08-24 22:25:35 -0400
committerbunnei <bunneidev@gmail.com>2014-08-24 22:25:35 -0400
commit613b0a8df85578c97790c5b116195e8bd2fad6f4 (patch)
tree64505f9f1dbe1d10b8b15661db8f2dc191d8ca98 /src/citra_qt/main.cpp
parentfab2f28ea5f33106dfdc5d1c4197e01b4be9276a (diff)
parent1b1205cf739d0913dd474779245fd59dccbf2fcf (diff)
Merge pull request #75 from xsacha/qt5
Fix threading for Qt5.
Diffstat (limited to 'src/citra_qt/main.cpp')
-rw-r--r--src/citra_qt/main.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index e5190d48a..9a16cf92d 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -142,7 +142,6 @@ void GMainWindow::BootGame(std::string filename)
registersWidget->OnCPUStepped();
callstackWidget->OnCPUStepped();
- render_window->DoneCurrent(); // make sure EmuThread can access GL context
render_window->GetEmuThread().SetFilename(filename);
render_window->GetEmuThread().start();
@@ -204,7 +203,6 @@ void GMainWindow::ToggleWindowMode()
ui.horizontalLayout->removeWidget(render_window);
render_window->setParent(NULL);
render_window->setVisible(true);
- render_window->DoneCurrent();
render_window->RestoreGeometry();
}
else if (!enable && render_window->parent() == NULL)
@@ -212,7 +210,6 @@ void GMainWindow::ToggleWindowMode()
render_window->BackupGeometry();
ui.horizontalLayout->addWidget(render_window);
render_window->setVisible(true);
- render_window->DoneCurrent();
}
}