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

[Kernel] Handle title being null in XamShowMessageBoxUI.

This commit is contained in:
gibbed 2018-05-23 13:30:59 -05:00
parent 2ef3ea996f
commit d0561d046b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/kernel/xam/xam_ui.cc
View File

@ -99,7 +99,12 @@ SHIM_CALL XamShowMessageBoxUI_shim(PPCContext* ppc_context,
uint32_t result_ptr = SHIM_GET_ARG_32(7); uint32_t result_ptr = SHIM_GET_ARG_32(7);
uint32_t overlapped_ptr = SHIM_GET_ARG_32(8); uint32_t overlapped_ptr = SHIM_GET_ARG_32(8);
auto title = xe::load_and_swap<std::wstring>(SHIM_MEM_ADDR(title_ptr)); std::wstring title;
if (title_ptr) {
title = xe::load_and_swap<std::wstring>(SHIM_MEM_ADDR(title_ptr));
} else {
title = L""; // TODO(gibbed): default title based on flags?
}
auto text = xe::load_and_swap<std::wstring>(SHIM_MEM_ADDR(text_ptr)); auto text = xe::load_and_swap<std::wstring>(SHIM_MEM_ADDR(text_ptr));
std::vector<std::wstring> buttons; std::vector<std::wstring> buttons;
std::wstring all_buttons; std::wstring all_buttons;