From 27780f64e8d2f2344b1eab770b7e093f2e62aeb9 Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Wed, 17 Mar 2010 22:11:48 +0000 Subject: [PATCH] Tweaking labels, fixing mangled undo and a crash. --- src/tuxpaint.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index cf540f96c..30c7b0ad9 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -2328,6 +2328,7 @@ static void mainloop(void) { rec_undo_buffer(); do_render_cur_text(1); + label_node_to_edit = NULL; texttool_len = 0; cursor_textwidth = 0; if (cur_tool == TOOL_LABEL) @@ -2448,6 +2449,7 @@ static void mainloop(void) { rec_undo_buffer(); do_render_cur_text(1); + label_node_to_edit = NULL; cursor_x = min(cursor_x + cursor_textwidth, canvas->w); texttool_len = 0; cursor_textwidth = 0; @@ -12268,7 +12270,7 @@ static void do_png_embed_data(png_structp png_ptr) fprintf(lfi, "%d\n\n", r_canvas.h); current_node = start_label_node; - while (current_node != first_label_node_in_redo_stack) + while (current_node && current_node != first_label_node_in_redo_stack) { if (current_node->is_enabled == TRUE && current_node->save_texttool_len > 0) {