From 04d0116ae5e86cc9c0ac91138e46542b9159da6b Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Wed, 21 Jun 2023 22:39:21 -0700 Subject: [PATCH] Mend magic .sizes treated as a bool, instead of array h/t Shin-ichi for reporting seeing warnings about warning: the comparison will always evaluate as 'true' for the address of 'sizes' will never be NULL Magic tool ".sizes" was recently turned into an array (per-mode of the Magic tool), but a few references forgot to account for that. Corrected like so e.g., from if (magics[magic_group][cur_thing].sizes) to if (magics[magic_group][cur_thing].sizes[magic_modeint(magics[magic_group][cur_thing].mode)]) --- src/tuxpaint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 82151dcf7..31635f015 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -3739,7 +3739,7 @@ static void mainloop(void) if (magics[magic_group][cur_thing].colors) magic_set_color(); - if (magics[magic_group][cur_thing].sizes) + if (magics[magic_group][cur_thing].sizes[magic_modeint(magics[magic_group][cur_thing].mode)]) magic_set_size(); } else if (cur_tool == TOOL_ERASER) @@ -4361,7 +4361,7 @@ static void mainloop(void) if (magics[magic_group][cur_thing].colors) magic_set_color(); - if (magics[magic_group][cur_thing].sizes) + if (magics[magic_group][cur_thing].sizes[magic_modeint(magics[magic_group][cur_thing].mode)]) magic_set_size(); magic_switchin(canvas); @@ -5101,7 +5101,7 @@ static void mainloop(void) if (magics[grp][cur].colors) magic_set_color(); - if (magics[grp][cur].sizes) + if (magics[grp][cur].sizes[magic_modeint(magics[grp][cur].mode)]) magic_set_size(); magic_switchin(canvas);