Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent softlock on shutdown and various cleanup

Browse source
This commit is contained in:
James Rowe 2019-09-20 19:09:48 -06:00
parent 9c32c0b98b
commit 26d828fb4c
6 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/citra_qt/bootmanager.cpp
View file

@ -86,7 +86,6 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread)
setWindowTitle(QStringLiteral("Citra %1 | %2-%3")
.arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc));
setAttribute(Qt::WA_AcceptTouchEvents);
connect(this, &QOpenGLWidget::frameSwapped, this, &GRenderWindow::OnFrameSwapped);
InputCommon::Init();
}
@ -104,10 +103,6 @@ void GRenderWindow::DoneCurrent() {
void GRenderWindow::PollEvents() {}
void OnFrameSwapped() {
VideoCore::g_renderer->PresentComplete();
}
// On Qt 5.0+, this correctly gets the size of the framebuffer (pixels).
//
// Older versions get the window size (density independent pixels),
@ -303,10 +298,6 @@ void GRenderWindow::paintGL() {
update();
}
void GRenderWindow::OnFrameSwapped() {
VideoCore::g_renderer->PresentComplete();
}
void GRenderWindow::showEvent(QShowEvent* event) {
QWidget::showEvent(event);
}