Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-24 02:44:17 +00:00
Code Issues Activity

Hotfix 2 for panic for icons (#507)

Browse source 
* Update menu.rs

* Update menu.rs

* Update save_states.rs
This commit is contained in:
jugeeya 2023-03-14 08:44:01 -07:00 committed by GitHub
parent 14bf45de4f
commit 9ea0ddb690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/training/save_states.rs
View file

@ -354,7 +354,7 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
] ]
.contains(&fighter_kind); .contains(&fighter_kind);
if !is_operation_cpu(module_accessor) if MENU.save_state_slot_enable == OnOff::On && !is_operation_cpu(module_accessor)
&& button_config::combo_passes_exclusive( && button_config::combo_passes_exclusive(
module_accessor, module_accessor,
button_config::ButtonCombo::PrevSaveStateSlot, button_config::ButtonCombo::PrevSaveStateSlot,
@ -375,7 +375,7 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
return; return;
} }
if !is_operation_cpu(module_accessor) if MENU.save_state_slot_enable == OnOff::On && !is_operation_cpu(module_accessor)
&& button_config::combo_passes_exclusive( && button_config::combo_passes_exclusive(
module_accessor, module_accessor,
button_config::ButtonCombo::NextSaveStateSlot, button_config::ButtonCombo::NextSaveStateSlot,

18
src/training/ui/menu.rs
View file

@ -195,10 +195,20 @@ unsafe fn render_toggle_page(app: &App, root_pane: &mut Pane) {
let submenu_ids = app.submenu_ids(); let submenu_ids = app.submenu_ids();
submenu_ids.iter().for_each(|id| { submenu_ids.iter().for_each(|id| {
menu_button // TODO: Break if ID not found on release
.find_pane_by_name_recursive(id)
.unwrap() let icon = menu_button
.set_visible(false)
.find_pane_by_name_recursive(id);
if let Some(icon) = icon {
icon
.set_visible(false);
}
}); });
title_text.set_text_string(name); title_text.set_text_string(name);