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

For Qt netplay, changed client message dialogs to be non-blocking. This prevents re-entrant event loops.

This commit is contained in:
harry 2024-04-07 14:53:06 -04:00
parent e751431099
commit e032d65811
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/drivers/Qt/NetPlay.cpp
View File

@ -19,6 +19,7 @@
*/ */
#include <QDir> #include <QDir>
#include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
#include <QTemporaryFile> #include <QTemporaryFile>
@ -840,7 +841,7 @@ void NetPlayServer::processClientRomLoadRequests(void)
{ {
netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG); netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG);
errorMsg.setFlag(netPlayTextMsgFlags::Warning); errorMsg.setFlag(netPlayTextMsgFlags::Warning);
errorMsg.printf("Host is rejected ROMs load request"); errorMsg.printf("Host has rejected ROM load request");
sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } ); sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } );
} }
@ -1127,6 +1128,11 @@ NetPlayClient::~NetPlayClient(void)
{ {
::free(recvMsgBuf); recvMsgBuf = nullptr; ::free(recvMsgBuf); recvMsgBuf = nullptr;
} }
if (numMsgBoxObjs != 0)
{
printf("Warning: Client has leaked message dialogs\n");
}
printf("NetPlayClient Destructor\n"); printf("NetPlayClient Destructor\n");
} }
@ -1611,9 +1617,15 @@ void NetPlayClient::clientProcessMessage( void *msgBuf, size_t msgSize )
msg->toHostByteOrder(); msg->toHostByteOrder();
FCEU_printf("NetPlay Error: %s\n", msg->getBuffer()); FCEU_printf("NetPlay Error: %s\n", msg->getBuffer());
numMsgBoxObjs++;
QString msgBoxTxt = tr("Host has replied with an error:\n\n"); QString msgBoxTxt = tr("Host has replied with an error:\n\n");
msgBoxTxt += tr(msg->getBuffer()); msgBoxTxt += tr(msg->getBuffer());
QMessageBox::critical( consoleWindow, tr("NetPlay Error"), msgBoxTxt, QMessageBox::Ok );
QMessageBox* msgBox = new QMessageBox( QMessageBox::Critical, tr("NetPlay Error"), msgBoxTxt, QMessageBox::Ok, consoleWindow );
connect( msgBox->button(QMessageBox::Ok), SIGNAL(clicked(void)), msgBox, SLOT(accept(void)));
connect( msgBox, &QMessageBox::finished, this, [this, msgBox](){ msgBox->deleteLater(); } );
connect( msgBox, SIGNAL(destroyed(QObject*)), this, SLOT(onMessageBoxDestroy(QObject*)));
msgBox->show();
if (msg->isFlagSet(netPlayTextMsgFlags::Disconnect)) if (msg->isFlagSet(netPlayTextMsgFlags::Disconnect))
{ {
@ -1743,6 +1755,19 @@ void NetPlayClient::clientReadyRead()
readMessages( clientMessageCallback, this ); readMessages( clientMessageCallback, this );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void NetPlayClient::onMessageBoxDestroy(QObject* obj)
{
//printf("MessageBox Destroyed: %p\n", obj);
if (numMsgBoxObjs > 0)
{
numMsgBoxObjs--;
}
else
{
printf("Warning: Unexpected MessageBox Destroy: %p\n", obj);
}
}
//-----------------------------------------------------------------------------
//--- NetPlayHostDialog //--- NetPlayHostDialog
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
NetPlayHostDialog* NetPlayHostDialog::instance = nullptr; NetPlayHostDialog* NetPlayHostDialog::instance = nullptr;

2
src/drivers/Qt/NetPlay.h
View File

@ -327,6 +327,7 @@ class NetPlayClient : public QObject
uint64_t pingDelayLast = 0; uint64_t pingDelayLast = 0;
uint64_t pingNumSamples = 0; uint64_t pingNumSamples = 0;
uint32_t romCrc32 = 0; uint32_t romCrc32 = 0;
uint32_t numMsgBoxObjs = 0;
std::list <NetPlayFrameInput> input; std::list <NetPlayFrameInput> input;
FCEU::mutex inputMtx; FCEU::mutex inputMtx;
@ -345,6 +346,7 @@ class NetPlayClient : public QObject
void onRomUnload(void); void onRomUnload(void);
void serverReadyRead(void); void serverReadyRead(void);
void clientReadyRead(void); void clientReadyRead(void);
void onMessageBoxDestroy(QObject* obj);
}; };