CyberGroup
/
yuzu
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5799 from ogniK5377/event-register-unregister 

nvdrv: Unregister already registered events
This commit is contained in:
bunnei 2021-01-24 23:19:10 -08:00 committed by GitHub
parent 62766b1326 822edff5bd
commit 2a2ee62cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
View File

@ -155,8 +155,14 @@ NvResult nvhost_ctrl::IocCtrlEventRegister(const std::vector<u8>& input, std::ve
return NvResult::BadParameter; return NvResult::BadParameter;
} }
if (events_interface.registered[event_id]) { if (events_interface.registered[event_id]) {
const auto event_state = events_interface.status[event_id];
if (event_state != EventState::Free) {
LOG_WARNING(Service_NVDRV, "Event already registered! Unregistering previous event");
events_interface.UnregisterEvent(event_id);
} else {
return NvResult::BadParameter; return NvResult::BadParameter;
} }
}
events_interface.RegisterEvent(event_id); events_interface.RegisterEvent(event_id);
return NvResult::Success; return NvResult::Success;
} }