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

Move thread unpausing from destructor to shutdown

This commit is contained in:
Jeffrey Pfau 2014-10-25 17:32:11 -07:00
parent 10a907e387
commit b33e75daec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/qt/GameController.cpp
View File

@ -92,9 +92,6 @@ GameController::GameController(QObject* parent)
GameController::~GameController() { GameController::~GameController() {
m_audioThread->quit(); m_audioThread->quit();
m_audioThread->wait(); m_audioThread->wait();
if (GBAThreadIsPaused(&m_threadContext)) {
GBAThreadUnpause(&m_threadContext);
}
disconnect(); disconnect();
closeGame(); closeGame();
delete m_renderer; delete m_renderer;
@ -189,6 +186,9 @@ void GameController::closeGame() {
if (!m_gameOpen) { if (!m_gameOpen) {
return; return;
} }
if (GBAThreadIsPaused(&m_threadContext)) {
GBAThreadUnpause(&m_threadContext);
}
GBAThreadEnd(&m_threadContext); GBAThreadEnd(&m_threadContext);
GBAThreadJoin(&m_threadContext); GBAThreadJoin(&m_threadContext);
if (m_threadContext.fname) { if (m_threadContext.fname) {