diff options
| author | Liam <byteslice@airmail.cc> | 2023-03-25 13:29:08 -0400 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2023-03-25 14:49:43 -0400 |
| commit | eb8abae7eb3e760e85aae09e59b9bd9a3572cd83 (patch) | |
| tree | 49ed16c5614ad4772f5183ac7bbbb911ce092c1a /src/yuzu/applets/qt_web_browser.cpp | |
| parent | 46f5e0a276ab730a44b4995561d7ea77e382943d (diff) | |
qt: implement RequestExit for applets
Diffstat (limited to 'src/yuzu/applets/qt_web_browser.cpp')
| -rw-r--r-- | src/yuzu/applets/qt_web_browser.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/yuzu/applets/qt_web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp index 0a5912326a..28acc0ff81 100644 --- a/src/yuzu/applets/qt_web_browser.cpp +++ b/src/yuzu/applets/qt_web_browser.cpp @@ -393,6 +393,8 @@ void QtNXWebEngineView::FocusFirstLinkElement() { QtWebBrowser::QtWebBrowser(GMainWindow& main_window) { connect(this, &QtWebBrowser::MainWindowOpenWebPage, &main_window, &GMainWindow::WebBrowserOpenWebPage, Qt::QueuedConnection); + connect(this, &QtWebBrowser::MainWindowRequestExit, &main_window, + &GMainWindow::WebBrowserRequestExit, Qt::QueuedConnection); connect(&main_window, &GMainWindow::WebBrowserExtractOfflineRomFS, this, &QtWebBrowser::MainWindowExtractOfflineRomFS, Qt::QueuedConnection); connect(&main_window, &GMainWindow::WebBrowserClosed, this, @@ -401,6 +403,11 @@ QtWebBrowser::QtWebBrowser(GMainWindow& main_window) { QtWebBrowser::~QtWebBrowser() = default; +void QtWebBrowser::Close() const { + callback = {}; + emit MainWindowRequestExit(); +} + void QtWebBrowser::OpenLocalWebPage(const std::string& local_url, ExtractROMFSCallback extract_romfs_callback_, OpenWebPageCallback callback_) const { @@ -436,5 +443,7 @@ void QtWebBrowser::MainWindowExtractOfflineRomFS() { void QtWebBrowser::MainWindowWebBrowserClosed(Service::AM::Applets::WebExitReason exit_reason, std::string last_url) { - callback(exit_reason, last_url); + if (callback) { + callback(exit_reason, last_url); + } } |
