diff --git a/src/sdl2/messagebox.rs b/src/sdl2/messagebox.rs index 10ea85b660..ce4056e9b4 100644 --- a/src/sdl2/messagebox.rs +++ b/src/sdl2/messagebox.rs @@ -232,6 +232,7 @@ where }) .collect(); let result = unsafe { + let scheme = scheme.map(|scheme| sys::SDL_MessageBoxColorScheme { colors: scheme.into() }); let msg_box_data = sys::SDL_MessageBoxData { flags: flags.bits(), window: window.map_or(ptr::null_mut(), |win| win.raw()), @@ -239,13 +240,7 @@ where message: message.as_ptr() as *const c_char, numbuttons: raw_buttons.len() as c_int, buttons: raw_buttons.as_ptr(), - colorScheme: if let Some(scheme) = scheme { - &sys::SDL_MessageBoxColorScheme { - colors: From::from(scheme), - } as *const _ - } else { - ptr::null() - }, + colorScheme: scheme.as_ref().map(|p| p as *const _).unwrap_or(ptr::null()), }; sys::SDL_ShowMessageBox(&msg_box_data as *const _, &mut button_id as &mut _) } == 0;