diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-03-29 15:11:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-29 15:11:34 +0200 |
commit | 8bdc51b620f0778f53d76ad9368da97a9213d631 (patch) | |
tree | 2a71c944643cda0ab019c22d1d46d58552f002ff /src/yuzu/applets/qt_amiibo_settings.cpp | |
parent | Merge pull request #10003 from german77/disconnect (diff) | |
parent | qt: implement RequestExit for applets (diff) | |
download | yuzu-8bdc51b620f0778f53d76ad9368da97a9213d631.tar yuzu-8bdc51b620f0778f53d76ad9368da97a9213d631.tar.gz yuzu-8bdc51b620f0778f53d76ad9368da97a9213d631.tar.bz2 yuzu-8bdc51b620f0778f53d76ad9368da97a9213d631.tar.lz yuzu-8bdc51b620f0778f53d76ad9368da97a9213d631.tar.xz yuzu-8bdc51b620f0778f53d76ad9368da97a9213d631.tar.zst yuzu-8bdc51b620f0778f53d76ad9368da97a9213d631.zip |
Diffstat (limited to 'src/yuzu/applets/qt_amiibo_settings.cpp')
-rw-r--r-- | src/yuzu/applets/qt_amiibo_settings.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/yuzu/applets/qt_amiibo_settings.cpp b/src/yuzu/applets/qt_amiibo_settings.cpp index 93ad4b4f9..4559df5b1 100644 --- a/src/yuzu/applets/qt_amiibo_settings.cpp +++ b/src/yuzu/applets/qt_amiibo_settings.cpp @@ -245,12 +245,19 @@ void QtAmiiboSettingsDialog::SetSettingsDescription() { QtAmiiboSettings::QtAmiiboSettings(GMainWindow& parent) { connect(this, &QtAmiiboSettings::MainWindowShowAmiiboSettings, &parent, &GMainWindow::AmiiboSettingsShowDialog, Qt::QueuedConnection); + connect(this, &QtAmiiboSettings::MainWindowRequestExit, &parent, + &GMainWindow::AmiiboSettingsRequestExit, Qt::QueuedConnection); connect(&parent, &GMainWindow::AmiiboSettingsFinished, this, &QtAmiiboSettings::MainWindowFinished, Qt::QueuedConnection); } QtAmiiboSettings::~QtAmiiboSettings() = default; +void QtAmiiboSettings::Close() const { + callback = {}; + emit MainWindowRequestExit(); +} + void QtAmiiboSettings::ShowCabinetApplet( const Core::Frontend::CabinetCallback& callback_, const Core::Frontend::CabinetParameters& parameters, @@ -260,5 +267,7 @@ void QtAmiiboSettings::ShowCabinetApplet( } void QtAmiiboSettings::MainWindowFinished(bool is_success, const std::string& name) { - callback(is_success, name); + if (callback) { + callback(is_success, name); + } } |