ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix shutdown crashes

This commit is contained in:
Vicki Pfau 2019-05-20 15:31:47 -07:00
parent eeee6fe44e
commit bda0f67103
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gba/extra/proxy.c
View File

@ -133,6 +133,7 @@ void GBAVideoProxyRendererDeinit(struct GBAVideoRenderer* renderer) {
proxyRenderer->backend->deinit(proxyRenderer->backend); proxyRenderer->backend->deinit(proxyRenderer->backend);
} else { } else {
proxyRenderer->logger->postEvent(proxyRenderer->logger, LOGGER_EVENT_DEINIT); proxyRenderer->logger->postEvent(proxyRenderer->logger, LOGGER_EVENT_DEINIT);
mVideoLoggerRendererFlush(proxyRenderer->logger);
} }
mVideoLoggerRendererDeinit(proxyRenderer->logger); mVideoLoggerRendererDeinit(proxyRenderer->logger);

3
src/platform/qt/CoreController.cpp
View File

@ -196,9 +196,6 @@ CoreController::~CoreController() {
mCacheSetDeinit(m_cacheSet.get()); mCacheSetDeinit(m_cacheSet.get());
m_cacheSet.reset(); m_cacheSet.reset();
} }
mCoreConfigDeinit(&m_threadContext.core->config);
m_threadContext.core->deinit(m_threadContext.core);
} }
const color_t* CoreController::drawContext() { const color_t* CoreController::drawContext() {

18
src/platform/qt/Window.cpp
View File

@ -631,8 +631,10 @@ void Window::closeEvent(QCloseEvent* event) {
m_config->setOption("width", GBA_VIDEO_HORIZONTAL_PIXELS * m_savedScale); m_config->setOption("width", GBA_VIDEO_HORIZONTAL_PIXELS * m_savedScale);
} }
saveConfig(); saveConfig();
m_display.reset(); if (m_controller) {
QMainWindow::closeEvent(event); event->ignore();
m_pendingClose = true;
}
} }
void Window::focusInEvent(QFocusEvent*) { void Window::focusInEvent(QFocusEvent*) {
@ -776,6 +778,11 @@ void Window::gameStarted() {
void Window::gameStopped() { void Window::gameStopped() {
m_controller.reset(); m_controller.reset();
m_display->stopDrawing();
if (m_pendingClose) {
m_display.reset();
close();
}
#ifdef M_CORE_GBA #ifdef M_CORE_GBA
for (Action* action : m_platformActions) { for (Action* action : m_platformActions) {
action->setEnabled(true); action->setEnabled(true);
@ -863,7 +870,6 @@ void Window::reloadDisplayDriver() {
m_shaderView = std::make_unique<ShaderSelector>(m_display.get(), m_config); m_shaderView = std::make_unique<ShaderSelector>(m_display.get(), m_config);
#endif #endif
connect(this, &Window::shutdown, m_display.get(), &Display::stopDrawing);
connect(m_display.get(), &Display::hideCursor, [this]() { connect(m_display.get(), &Display::hideCursor, [this]() {
if (static_cast<QStackedLayout*>(m_screenWidget->layout())->currentWidget() == m_display.get()) { if (static_cast<QStackedLayout*>(m_screenWidget->layout())->currentWidget() == m_display.get()) {
m_screenWidget->setCursor(Qt::BlankCursor); m_screenWidget->setCursor(Qt::BlankCursor);
@ -888,7 +894,6 @@ void Window::reloadDisplayDriver() {
#endif #endif
if (m_controller) { if (m_controller) {
connect(m_controller.get(), &CoreController::stopping, m_display.get(), &Display::stopDrawing);
connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::resizeContext); connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::resizeContext);
connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::forceDraw); connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::forceDraw);
connect(m_controller.get(), &CoreController::rewound, m_display.get(), &Display::forceDraw); connect(m_controller.get(), &CoreController::rewound, m_display.get(), &Display::forceDraw);
@ -1700,6 +1705,9 @@ void Window::setController(CoreController* controller, const QString& fname) {
if (!controller) { if (!controller) {
return; return;
} }
if (m_pendingClose) {
return;
}
if (m_controller) { if (m_controller) {
m_controller->stop(); m_controller->stop();
@ -1739,6 +1747,7 @@ void Window::setController(CoreController* controller, const QString& fname) {
return; return;
} }
m_controller->stop(); m_controller->stop();
disconnect(m_controller.get(), &CoreController::started, this, &Window::gameStarted);
}); });
connect(m_controller.get(), &CoreController::started, this, &Window::gameStarted); connect(m_controller.get(), &CoreController::started, this, &Window::gameStarted);
@ -1766,7 +1775,6 @@ void Window::setController(CoreController* controller, const QString& fname) {
emit paused(false); emit paused(false);
}); });
connect(m_controller.get(), &CoreController::stopping, m_display.get(), &Display::stopDrawing);
connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::resizeContext); connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::resizeContext);
connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::forceDraw); connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::forceDraw);
connect(m_controller.get(), &CoreController::rewound, m_display.get(), &Display::forceDraw); connect(m_controller.get(), &CoreController::rewound, m_display.get(), &Display::forceDraw);

1
src/platform/qt/Window.h
View File

@ -209,6 +209,7 @@ private:
QString m_pendingPatch; QString m_pendingPatch;
QString m_pendingState; QString m_pendingState;
bool m_pendingPause = false; bool m_pendingPause = false;
bool m_pendingClose = false;
bool m_hitUnimplementedBiosCall; bool m_hitUnimplementedBiosCall;