lux/yuzu
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/yuzu.git synced 2024-11-15 18:43:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7927 from german77/amiibo

Browse source 
yuzu: Disconnect amiibos on drag and drop
This commit is contained in:
bunnei 2022-02-24 23:13:32 -08:00 committed by GitHub
parent 1079215871 b504df9d02
commit f582a4482d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yuzu/main.cpp
View file

@ -2937,6 +2937,7 @@ void GMainWindow::OnLoadAmiibo() {
if (nfc_state == Service::NFP::DeviceState::TagFound || if (nfc_state == Service::NFP::DeviceState::TagFound ||
nfc_state == Service::NFP::DeviceState::TagMounted) { nfc_state == Service::NFP::DeviceState::TagMounted) {
nfc->CloseAmiibo(); nfc->CloseAmiibo();
QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed"));
return; return;
} }
@ -2965,6 +2966,15 @@ void GMainWindow::LoadAmiibo(const QString& filename) {
return; return;
} }
// Remove amiibo if one is connected
const auto nfc_state = nfc->GetCurrentState();
if (nfc_state == Service::NFP::DeviceState::TagFound ||
nfc_state == Service::NFP::DeviceState::TagMounted) {
nfc->CloseAmiibo();
QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed"));
return;
}
QFile nfc_file{filename}; QFile nfc_file{filename};
if (!nfc_file.open(QIODevice::ReadOnly)) { if (!nfc_file.open(QIODevice::ReadOnly)) {
QMessageBox::warning(this, tr("Error opening Amiibo data file"), QMessageBox::warning(this, tr("Error opening Amiibo data file"),