mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-03-07 08:06:14 -05:00
0eef4e25ee
CEF crashes on shutdown if any browser window remains open during the shutdown flow. Reproducible 100% of the time on Linux with What's New. The previous implementation of the What's New dialog correctly deleted all the Qt widgets, but the CEF internal event flow would only call the "preparing to close" function, and never the "window safely closed" function. Moving the code (practically unchanged) to a custom QDialog solves the problem entirely, and is more consistent with other uses.
75 lines
1.5 KiB
C++
75 lines
1.5 KiB
C++
#include "moc_window-whats-new.cpp"
|
|
|
|
#include <QPushButton>
|
|
#include <QHBoxLayout>
|
|
#include <QVBoxLayout>
|
|
|
|
#include "window-basic-main.hpp"
|
|
|
|
#ifdef BROWSER_AVAILABLE
|
|
#include <browser-panel.hpp>
|
|
extern QCef *cef;
|
|
#endif
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
OBSWhatsNew::OBSWhatsNew(QWidget *parent, const std::string &url) : QDialog(parent)
|
|
{
|
|
#ifdef BROWSER_AVAILABLE
|
|
if (!cef) {
|
|
return;
|
|
}
|
|
|
|
setWindowTitle("What's New");
|
|
setAttribute(Qt::WA_DeleteOnClose, true);
|
|
resize(700, 600);
|
|
|
|
Qt::WindowFlags flags = windowFlags();
|
|
Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;
|
|
setWindowFlags(flags & (~helpFlag));
|
|
|
|
OBSBasic::InitBrowserPanelSafeBlock();
|
|
|
|
cefWidget = cef->create_widget(nullptr, url);
|
|
if (!cefWidget) {
|
|
return;
|
|
}
|
|
|
|
connect(cefWidget, &QCefWidget::titleChanged, this, &OBSWhatsNew::setWindowTitle);
|
|
|
|
QPushButton *close = new QPushButton(QTStr("Close"));
|
|
connect(close, &QAbstractButton::clicked, this, &QDialog::accept);
|
|
|
|
QHBoxLayout *bottomLayout = new QHBoxLayout();
|
|
bottomLayout->addStretch();
|
|
bottomLayout->addWidget(close);
|
|
bottomLayout->addStretch();
|
|
|
|
QVBoxLayout *topLayout = new QVBoxLayout(this);
|
|
topLayout->addWidget(cefWidget);
|
|
topLayout->addLayout(bottomLayout);
|
|
|
|
show();
|
|
#else
|
|
UNUSED_PARAMETER(url);
|
|
#endif
|
|
}
|
|
|
|
OBSWhatsNew::~OBSWhatsNew() {}
|
|
|
|
void OBSWhatsNew::reject()
|
|
{
|
|
#ifdef BROWSER_AVAILABLE
|
|
delete cefWidget;
|
|
#endif
|
|
QDialog::reject();
|
|
}
|
|
|
|
void OBSWhatsNew::accept()
|
|
{
|
|
#ifdef BROWSER_AVAILABLE
|
|
delete cefWidget;
|
|
#endif
|
|
QDialog::accept();
|
|
}
|