notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash bug if undoing or redoing a mirror/flip when NOT usign a Starter.

Browse source
This commit is contained in:
William Kendrick 2004-09-28 08:02:07 +00:00
parent e9309f102b
commit 72d839e3be
1 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/tuxpaint.c
View file

@ -21,12 +21,12 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
June 14, 2002 - September 23, 2004 June 14, 2002 - September 28, 2004
*/ */
#define VER_VERSION "0.9.14" #define VER_VERSION "0.9.14"
#define VER_DATE "2004-09-23" #define VER_DATE "2004-09-28"
/* #define DEBUG */ /* #define DEBUG */
@ -7177,15 +7177,18 @@ void do_undo(void)
SDL_BlitSurface(undo_bufs[cur_undo], NULL, canvas, NULL); SDL_BlitSurface(undo_bufs[cur_undo], NULL, canvas, NULL);
if (undo_starters[cur_undo] == UNDO_STARTER_MIRRORED) if (img_starter != NULL)
{ {
starter_mirrored = !starter_mirrored; if (undo_starters[cur_undo] == UNDO_STARTER_MIRRORED)
mirror_starter(); {
} starter_mirrored = !starter_mirrored;
else if (undo_starters[cur_undo] == UNDO_STARTER_FLIPPED) mirror_starter();
{ }
starter_flipped = !starter_flipped; else if (undo_starters[cur_undo] == UNDO_STARTER_FLIPPED)
flip_starter(); {
starter_flipped = !starter_flipped;
flip_starter();
}
} }
update_canvas(0, 0, (WINDOW_WIDTH - 96), (48 * 7) + 40 + HEIGHTOFFSET); update_canvas(0, 0, (WINDOW_WIDTH - 96), (48 * 7) + 40 + HEIGHTOFFSET);
@ -7225,15 +7228,18 @@ void do_redo(void)
{ {
if (cur_undo != newest_undo) if (cur_undo != newest_undo)
{ {
if (undo_starters[cur_undo] == UNDO_STARTER_MIRRORED) if (img_starter != NULL)
{ {
starter_mirrored = !starter_mirrored; if (undo_starters[cur_undo] == UNDO_STARTER_MIRRORED)
mirror_starter(); {
} starter_mirrored = !starter_mirrored;
else if (undo_starters[cur_undo] == UNDO_STARTER_FLIPPED) mirror_starter();
{ }
starter_flipped = !starter_flipped; else if (undo_starters[cur_undo] == UNDO_STARTER_FLIPPED)
flip_starter(); {
starter_flipped = !starter_flipped;
flip_starter();
}
} }
cur_undo = (cur_undo + 1) % NUM_UNDO_BUFS; cur_undo = (cur_undo + 1) % NUM_UNDO_BUFS;