diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-06-23 09:27:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 09:27:00 -0400 |
| commit | 87b9b5d10fa4a30c8eb56f9de44ba0c24d57ae77 (patch) | |
| tree | 4239b5df2c866aa26e123719fe838bd6eb0e0394 /src/yuzu/main.cpp | |
| parent | 575d467d953fcbf67eaac0d892201c35320967a6 (diff) | |
| parent | 84d43489c5df9f450efb0293cc58161d08e3b882 (diff) | |
Merge pull request #10842 from german77/native_mifare
input_common: Implement native mifare/skylander support for joycons/pro controller
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 8768a7c3c..45a39451d 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3840,7 +3840,7 @@ void GMainWindow::OnLoadAmiibo() { auto* virtual_amiibo = input_subsystem->GetVirtualAmiibo(); // Remove amiibo if one is connected - if (virtual_amiibo->GetCurrentState() == InputCommon::VirtualAmiibo::State::AmiiboIsOpen) { + if (virtual_amiibo->GetCurrentState() == InputCommon::VirtualAmiibo::State::TagNearby) { virtual_amiibo->CloseAmiibo(); QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed")); return; @@ -3868,7 +3868,7 @@ void GMainWindow::LoadAmiibo(const QString& filename) { auto* virtual_amiibo = input_subsystem->GetVirtualAmiibo(); const QString title = tr("Error loading Amiibo data"); // Remove amiibo if one is connected - if (virtual_amiibo->GetCurrentState() == InputCommon::VirtualAmiibo::State::AmiiboIsOpen) { + if (virtual_amiibo->GetCurrentState() == InputCommon::VirtualAmiibo::State::TagNearby) { virtual_amiibo->CloseAmiibo(); QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed")); return; |