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

[XAM] Fixed nullptr crash in XamShowMessageBoxUI

This commit is contained in:
Gliniak 2024-12-27 10:25:20 +01:00
parent 9dfb0d0b68
commit 580b1f4345
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -784,12 +784,8 @@ static dword_result_t XamShowMessageBoxUi(
dword_t user_index, lpu16string_t title_ptr, lpu16string_t text_ptr, dword_t user_index, lpu16string_t title_ptr, lpu16string_t text_ptr,
dword_t button_count, lpdword_t button_ptrs, dword_t active_button, dword_t button_count, lpdword_t button_ptrs, dword_t active_button,
dword_t flags, lpdword_t result_ptr, pointer_t<XAM_OVERLAPPED> overlapped) { dword_t flags, lpdword_t result_ptr, pointer_t<XAM_OVERLAPPED> overlapped) {
std::string title; std::string title = title_ptr ? xe::to_utf8(title_ptr.value()) : "";
if (title_ptr) { std::string text = text_ptr ? xe::to_utf8(text_ptr.value()) : "";
title = xe::to_utf8(title_ptr.value());
} else {
title = ""; // TODO(gibbed): default title based on flags?
}
std::vector<std::string> buttons; std::vector<std::string> buttons;
for (uint32_t i = 0; i < button_count; ++i) { for (uint32_t i = 0; i < button_count; ++i) {
@ -830,7 +826,6 @@ static dword_result_t XamShowMessageBoxUi(
const Emulator* emulator = kernel_state()->emulator(); const Emulator* emulator = kernel_state()->emulator();
ui::ImGuiDrawer* imgui_drawer = emulator->imgui_drawer(); ui::ImGuiDrawer* imgui_drawer = emulator->imgui_drawer();
auto text = xe::to_utf8(text_ptr.value());
result = xeXamDispatchDialog<MessageBoxDialog>( result = xeXamDispatchDialog<MessageBoxDialog>(
new MessageBoxDialog(imgui_drawer, title, text, buttons, new MessageBoxDialog(imgui_drawer, title, text, buttons,
static_cast<uint32_t>(active_button)), static_cast<uint32_t>(active_button)),