Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 13:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: De-globalize HLE lock (#7212)

Browse source
This commit is contained in:
GPUCode 2023-11-29 00:15:27 +02:00 • committed by GitHub
parent 83b329f6e1
commit 6ec079ede8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 66 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/citra_qt/main.cpp
View file

@ -2118,6 +2118,7 @@ void GMainWindow::OnLoadAmiibo() {
return;
}
std::scoped_lock lock{system.Kernel().GetHLELock()};
if (nfc->IsTagActive()) {
QMessageBox::warning(this, tr("Error opening amiibo data file"),
tr("A tag is already in use."));
@ -2148,6 +2149,7 @@ void GMainWindow::LoadAmiibo(const QString& filename) {
return;
}
std::scoped_lock lock{system.Kernel().GetHLELock()};
if (!nfc->LoadAmiibo(filename.toStdString())) {
QMessageBox::warning(this, tr("Error opening amiibo data file"),
tr("Unable to open amiibo file \"%1\" for reading.").arg(filename));
@ -2164,6 +2166,7 @@ void GMainWindow::OnRemoveAmiibo() {
return;
}
std::scoped_lock lock{system.Kernel().GetHLELock()};
nfc->RemoveAmiibo();
ui->action_Remove_Amiibo->setEnabled(false);
}