summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-08-24 22:25:35 -0400
committerGravatar bunnei2014-08-24 22:25:35 -0400
commit613b0a8df85578c97790c5b116195e8bd2fad6f4 (patch)
tree64505f9f1dbe1d10b8b15661db8f2dc191d8ca98 /src/citra_qt/main.cpp
parentMerge pull request #73 from yuriks/remove-docs (diff)
parentPass format to the QGLWidget and use atomic instead of mutex. (diff)
downloadyuzu-613b0a8df85578c97790c5b116195e8bd2fad6f4.tar.gz
yuzu-613b0a8df85578c97790c5b116195e8bd2fad6f4.tar.xz
yuzu-613b0a8df85578c97790c5b116195e8bd2fad6f4.zip
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)
142 registersWidget->OnCPUStepped(); 142 registersWidget->OnCPUStepped();
143 callstackWidget->OnCPUStepped(); 143 callstackWidget->OnCPUStepped();
144 144
145 render_window->DoneCurrent(); // make sure EmuThread can access GL context
146 render_window->GetEmuThread().SetFilename(filename); 145 render_window->GetEmuThread().SetFilename(filename);
147 render_window->GetEmuThread().start(); 146 render_window->GetEmuThread().start();
148 147
@@ -204,7 +203,6 @@ void GMainWindow::ToggleWindowMode()
204 ui.horizontalLayout->removeWidget(render_window); 203 ui.horizontalLayout->removeWidget(render_window);
205 render_window->setParent(NULL); 204 render_window->setParent(NULL);
206 render_window->setVisible(true); 205 render_window->setVisible(true);
207 render_window->DoneCurrent();
208 render_window->RestoreGeometry(); 206 render_window->RestoreGeometry();
209 } 207 }
210 else if (!enable && render_window->parent() == NULL) 208 else if (!enable && render_window->parent() == NULL)
@@ -212,7 +210,6 @@ void GMainWindow::ToggleWindowMode()
212 render_window->BackupGeometry(); 210 render_window->BackupGeometry();
213 ui.horizontalLayout->addWidget(render_window); 211 ui.horizontalLayout->addWidget(render_window);
214 render_window->setVisible(true); 212 render_window->setVisible(true);
215 render_window->DoneCurrent();
216 } 213 }
217} 214}
218 215