archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 10:18:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cellOsk: reset options after unload

Browse source
This commit is contained in:
Megamouse 2021-09-19 21:51:45 +02:00
parent 696a3c4a42
commit 80ef0ce9b5
1 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View file

@ -70,6 +70,31 @@ struct osk_info
atomic_t<vm::ptr<cellOskDialogConfirmWordFilterCallback>> osk_confirm_callback{}; atomic_t<vm::ptr<cellOskDialogConfirmWordFilterCallback>> osk_confirm_callback{};
stx::init_mutex init; stx::init_mutex init;
void reset()
{
dlg.reset();
use_separate_windows = false;
lock_ext_input = false;
device_mask = 0;
key_layout = CELL_OSKDIALOG_10KEY_PANEL;
initial_key_layout = CELL_OSKDIALOG_INITIAL_PANEL_LAYOUT_SYSTEM;
initial_input_device = CELL_OSKDIALOG_INPUT_DEVICE_PAD;
clipboard_enabled = false;
half_byte_kana_enabled = false;
supported_languages = 0;
dimmer_enabled = true;
base_color_red = 1.0f;
base_color_blue = 1.0f;
base_color_green = 1.0f;
base_color_alpha = 1.0f;
pointer_enabled = false;
pointer_pos = {0.0f, 0.0f};
initial_scale = 1.0f;
layout_mode = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT | CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
osk_confirm_callback.store({});
}
}; };
// TODO: don't use this function // TODO: don't use this function
@ -370,8 +395,7 @@ error_code getText(vm::ptr<CellOskDialogCallbackReturnParam> OutputInfo, bool is
// Unload should be called last, so remove the dialog here // Unload should be called last, so remove the dialog here
if (const auto reset_lock = g_fxo->get<osk_info>().init.reset()) if (const auto reset_lock = g_fxo->get<osk_info>().init.reset())
{ {
// TODO g_fxo->get<osk_info>().reset();
g_fxo->get<osk_info>().dlg.reset();
} }
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_UNLOADED, 0); sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_UNLOADED, 0);