mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-19 20:32:15 +02:00
Code

UI: Fix crash on macOS when closing OAUTH browser panel

Browse Source 
Deleting the cefWidget in the panel's destructor can result in a crash
on macOS because the underlying NSView might have been destroyed in
memory between Qt closing the QDialog and the destructor call.

Moving the browser destruction into the accept and reject calls ensures
that CEF can clean up its state _before_ Qt tears down the view
hierarchy.
This commit is contained in:
PatTheMav 2023-05-07 23:23:52 +02:00 committed by Ryan Foster
parent 169cd07c42
commit efbae916fb
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
UI/auth-oauth.cpp
View File

@ -71,12 +71,7 @@ OAuthLogin::OAuthLogin(QWidget *parent, const std::string &url, bool token)
#endif
}
OAuthLogin::~OAuthLogin()
{
#ifdef BROWSER_AVAILABLE
delete cefWidget;
#endif
}
OAuthLogin::~OAuthLogin() {}
int OAuthLogin::exec()
{
@ -88,6 +83,22 @@ int OAuthLogin::exec()
return QDialog::Rejected;
}
void OAuthLogin::reject()
{
#ifdef BROWSER_AVAILABLE
delete cefWidget;
#endif
QDialog::reject();
}
void OAuthLogin::accept()
{
#ifdef BROWSER_AVAILABLE
delete cefWidget;
#endif
QDialog::accept();
}
void OAuthLogin::urlChanged(const QString &url)
{
std::string uri = get_token ? "access_token=" : "code=";

2
UI/auth-oauth.hpp
View File

@ -24,6 +24,8 @@ public:
inline bool LoadFail() const { return fail; }
virtual int exec() override;
virtual void reject() override;
virtual void accept() override;
public slots:
void urlChanged(const QString &url);