opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix closing OBS before showing whats new dialog

Browse Source 
The program can get stuck waiting for the browser within a event queue,
so instead mark that the program is closing, do it in a separate thread,
signal the window when it's finished, and then check whether it's in the
process of closing before actually showing the dialog.
This commit is contained in:
jp9000
2020-03-16 08:59:46 -07:00
parent 8faaf8491a
commit 0fb34ed965
4 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main.cpp
+36 -3
View File
@@ -1896,6 +1896,9 @@ void OBSBasic::ReceivedIntroJson(const QString &text)
{
#ifdef BROWSER_AVAILABLE
#ifdef _WIN32
if (closing)
return;
std::string err;
Json json = Json::parse(QT_TO_UTF8(text), err);
if (!err.empty())
@@ -1970,7 +1973,33 @@ void OBSBasic::ReceivedIntroJson(const QString &text)
}
#endif
cef->init_browser();
ExecuteFuncSafeBlock([] { cef->wait_for_browser_init(); });
WhatsNewBrowserInitThread *wnbit =
new WhatsNewBrowserInitThread(QT_UTF8(info_url.c_str()));
if (wnbit) {
connect(wnbit, &WhatsNewBrowserInitThread::Result, this,
&OBSBasic::ShowWhatsNew);
}
if (wnbit) {
whatsNewInitThread.reset(wnbit);
whatsNewInitThread->start();
}
#else
UNUSED_PARAMETER(text);
#endif
#else
UNUSED_PARAMETER(text);
#endif
}
void OBSBasic::ShowWhatsNew(const QString &url)
{
#ifdef BROWSER_AVAILABLE
#ifdef _WIN32
if (closing)
return;
std::string info_url = QT_TO_UTF8(url);
QDialog *dlg = new QDialog(this);
dlg->setAttribute(Qt::WA_DeleteOnClose, true);
@@ -2003,10 +2032,10 @@ void OBSBasic::ReceivedIntroJson(const QString &text)
dlg->show();
#else
UNUSED_PARAMETER(text);
UNUSED_PARAMETER(url);
#endif
#else
UNUSED_PARAMETER(text);
UNUSED_PARAMETER(url);
#endif
}
@@ -3933,8 +3962,12 @@ void OBSBasic::closeEvent(QCloseEvent *event)
blog(LOG_INFO, SHUTDOWN_SEPARATOR);
closing = true;
if (introCheckThread)
introCheckThread->wait();
if (whatsNewInitThread)
whatsNewInitThread->wait();
if (updateCheckThread)
updateCheckThread->wait();
if (logUploadThread)