ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9034 from OsirizX/uwp 

UWP: CoreWindow NULL check
This commit is contained in:
Twinaphex 2019-06-29 12:14:38 +02:00 committed by GitHub
parent 5d56302a31 ba69056361
commit d1afc8c49b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
uwp/uwp_main.cpp
View File

@ -574,7 +574,14 @@ extern "C" {
bool uwp_keyboard_pressed(unsigned key) bool uwp_keyboard_pressed(unsigned key)
{ {
unsigned sym = rarch_keysym_lut[(enum retro_key)key]; unsigned sym = rarch_keysym_lut[(enum retro_key)key];
return (CoreWindow::GetForCurrentThread()->GetKeyState((VirtualKey)sym) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down; CoreWindow^ window = CoreWindow::GetForCurrentThread();
if (!window)
{
// At times CoreWindow will return NULL while running Dolphin core
// Dolphin core runs on its own CPU thread separate from the UI-thread and so we must do a check for this.
return false;
}
return (window->GetKeyState((VirtualKey)sym) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down;
} }
int16_t uwp_mouse_state(unsigned port, unsigned id, bool screen) int16_t uwp_mouse_state(unsigned port, unsigned id, bool screen)