Skip to content

🔒 Fix potential panic on UI button interaction #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dynamikdev wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

🔒 Fix potential panic on UI button interaction #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/ui/systems.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ pub fn sequence_control_button_system(
mut rhythm_state: ResMut<RhythmState>,
) {
for (interaction, mut background_color, children) in &mut interaction_query {
let mut text = text_query.get_mut(children[0]).unwrap();
let Some(&child) = children.first() else { continue; };
let Ok(mut text) = text_query.get_mut(child) else { continue; };
match *interaction {
Interaction::Pressed => {
sequence_state.running = !sequence_state.running;
Expand Down Expand Up @@ -67,7 +68,8 @@ pub fn curriculum_toggle_system(
mut sequence_state: ResMut<SequenceState>,
) {
for (interaction, mut background_color, children) in &mut interaction_query {
let mut text = text_query.get_mut(children[0]).unwrap();
let Some(&child) = children.first() else { continue; };
let Ok(mut text) = text_query.get_mut(child) else { continue; };
match *interaction {
Interaction::Pressed => {
curriculum_state.is_visible = !curriculum_state.is_visible;
Expand Down Expand Up @@ -102,7 +104,8 @@ pub fn mode_toggle_system(
mut sequence_state: ResMut<SequenceState>,
) {
for (interaction, mut background_color, children) in &mut interaction_query {
let mut text = text_query.get_mut(children[0]).unwrap();
let Some(&child) = children.first() else { continue; };
let Ok(mut text) = text_query.get_mut(child) else { continue; };
match *interaction {
Interaction::Pressed => {
sequence_state.mode = match sequence_state.mode {
Expand Down Expand Up @@ -146,7 +149,8 @@ pub fn rhythm_mode_toggle_system(
mut rhythm_state: ResMut<RhythmState>,
) {
for (interaction, mut background_color, children) in &mut interaction_query {
let mut text = text_query.get_mut(children[0]).unwrap();
let Some(&child) = children.first() else { continue; };
let Ok(mut text) = text_query.get_mut(child) else { continue; };
match *interaction {
Interaction::Pressed => {
rhythm_state.mode = match rhythm_state.mode {
Expand Down