For Qt GUI. Added logic to show busy cursor when closing out an AVI recording. Fix for overloading GUI cursor, always call QGuiApplication::restoreOverrideCursor() to reset cursor to default.
This commit is contained in:
parent
7ecff090f2
commit
2a1c529231
src/drivers/Qt
|
@ -3843,11 +3843,13 @@ void consoleWin_t::aviRecordStop(void)
|
||||||
{
|
{
|
||||||
if ( aviRecordRunning() )
|
if ( aviRecordRunning() )
|
||||||
{
|
{
|
||||||
|
QGuiApplication::setOverrideCursor( QCursor(Qt::BusyCursor) );
|
||||||
FCEU_WRAPPER_LOCK();
|
FCEU_WRAPPER_LOCK();
|
||||||
aviDiskThread->requestInterruption();
|
aviDiskThread->requestInterruption();
|
||||||
aviDiskThread->quit();
|
aviDiskThread->quit();
|
||||||
aviDiskThread->wait(10000);
|
aviDiskThread->wait(10000);
|
||||||
FCEU_WRAPPER_UNLOCK();
|
FCEU_WRAPPER_UNLOCK();
|
||||||
|
QGuiApplication::restoreOverrideCursor();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -203,7 +203,7 @@ bool TASEDITOR_PROJECT::save(const char* differentName, bool inputInBinary, bool
|
||||||
{
|
{
|
||||||
delete progressDialog; progressDialog = NULL;
|
delete progressDialog; progressDialog = NULL;
|
||||||
}
|
}
|
||||||
QGuiApplication::setOverrideCursor( QCursor(Qt::ArrowCursor) );
|
QGuiApplication::restoreOverrideCursor();
|
||||||
|
|
||||||
//taseditorWindow.mustUpdateMouseCursor = true;
|
//taseditorWindow.mustUpdateMouseCursor = true;
|
||||||
return true;
|
return true;
|
||||||
|
@ -407,7 +407,7 @@ bool TASEDITOR_PROJECT::load(const char* fullName)
|
||||||
delete progressDialog; progressDialog = NULL;
|
delete progressDialog; progressDialog = NULL;
|
||||||
}
|
}
|
||||||
// restore mouse cursor shape
|
// restore mouse cursor shape
|
||||||
QGuiApplication::setOverrideCursor( QCursor(Qt::ArrowCursor) );
|
QGuiApplication::restoreOverrideCursor();
|
||||||
//taseditorWindow.mustUpdateMouseCursor = true;
|
//taseditorWindow.mustUpdateMouseCursor = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue