mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-11 15:40:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellOskDialog: use getter instead of weak_ptr

Browse Source
This commit is contained in:
Megamouse 2023-01-23 19:08:01 +01:00
parent daefe27fec
commit 81ff956a48
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View File

@ -275,11 +275,16 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
} }
} }
osk->on_osk_close = [wptr = std::weak_ptr<OskDialogBase>(osk)](s32 status) osk->on_osk_close = [](s32 status)
{ {
cellOskDialog.notice("on_osk_close(status=%d)", status); cellOskDialog.notice("on_osk_close(status=%d)", status);
const auto osk = wptr.lock(); const auto osk = _get_osk_dialog(false);
if (!osk)
{
return;
}
osk->state = OskDialogState::Closed; osk->state = OskDialogState::Closed;
auto& info = g_fxo->get<osk_info>(); auto& info = g_fxo->get<osk_info>();
@ -402,16 +407,17 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
}; };
// Set key callback // Set key callback
osk->on_osk_key_input_entered = [wptr = std::weak_ptr<OskDialogBase>(osk)](CellOskDialogKeyMessage key_message) osk->on_osk_key_input_entered = [](CellOskDialogKeyMessage key_message)
{ {
const auto osk = wptr.lock();
auto& info = g_fxo->get<osk_info>(); auto& info = g_fxo->get<osk_info>();
std::lock_guard lock(info.text_mtx); std::lock_guard lock(info.text_mtx);
auto event_hook_callback = info.osk_hardware_keyboard_event_hook_callback.load(); auto event_hook_callback = info.osk_hardware_keyboard_event_hook_callback.load();
cellOskDialog.notice("on_osk_key_input_entered: led=%d, mkey=%d, keycode=%d, hook_event_mode=%d, event_hook_callback=*0x%x", key_message.led, key_message.mkey, key_message.keycode, info.hook_event_mode.load(), event_hook_callback); cellOskDialog.notice("on_osk_key_input_entered: led=%d, mkey=%d, keycode=%d, hook_event_mode=%d, event_hook_callback=*0x%x", key_message.led, key_message.mkey, key_message.keycode, info.hook_event_mode.load(), event_hook_callback);
if (!event_hook_callback) const auto osk = _get_osk_dialog(false);
if (!osk || !event_hook_callback)
{ {
// Nothing to do here // Nothing to do here
return; return;