Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorperepujal <perepujal>2010-05-12 06:28:37 (GMT)
committer perepujal <perepujal>2010-05-12 06:28:37 (GMT)
commitbbaeecf3fe1ecf9ce2de6d5ea66b395745c33c9a (patch)
tree970358861e9fad596fb8fac05714c8e63a8e0e0f
parent64276839f71dfa931421fe19b7243f7458875922 (diff)
Fix undo for temporary applied labels.
-rw-r--r--src/tuxpaint.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index acdf4b9..7712168 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -1152,6 +1152,7 @@ static int undo_starters[NUM_UNDO_BUFS];
static int cur_undo, oldest_undo, newest_undo;
static int text_undo[NUM_UNDO_BUFS];
static int have_to_rec_label_node;
+static int have_to_rec_label_node_back;
static SDL_Surface *img_title, *img_title_credits, *img_title_tuxpaint;
static SDL_Surface *img_btn_up, *img_btn_down, *img_btn_off;
@@ -19404,6 +19405,8 @@ static void set_label_fonts()
static void tmp_apply_uncommited_text()
{
+ have_to_rec_label_node_back = have_to_rec_label_node;
+
if (texttool_len > 0)
{
if (cur_tool == TOOL_TEXT ||
@@ -19478,7 +19481,7 @@ static void undo_tmp_applied_text()
derender_node(&aux_label_node);
delete_label_list(&aux_label_node);
- have_to_rec_label_node = FALSE;
+ have_to_rec_label_node = have_to_rec_label_node_back;
do_render_cur_text(0);
}
}