From 58178671d0d219b337cd7a6195a6d1d9e5c05407 Mon Sep 17 00:00:00 2001 From: Vasily_Makarov Date: Mon, 13 Jun 2011 23:28:21 +0400 Subject: saedit: Fix player imageset bug --- saedit/main.c | 2 +- saedit/main.h | 6 ------ saedit/saedit | Bin 457610 -> 457582 bytes 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/saedit/main.c b/saedit/main.c index e069f78..769b55f 100644 --- a/saedit/main.c +++ b/saedit/main.c @@ -407,9 +407,9 @@ gboolean set_up_action_by_name(const gchar *name, SAEInfo *sae_info) { } void actions_combo_box_changed_handler(GtkComboBox *widget, gpointer user_data) { - set_up_action_by_name(gtk_combo_box_get_active_text(widget), gen_sae_info); if (player != NULL) set_up_action_by_name(gtk_combo_box_get_active_text(widget), player); + set_up_action_by_name(gtk_combo_box_get_active_text(widget), gen_sae_info); } void animations_combo_box_changed_handler(GtkComboBox *widget, gpointer user_data) { diff --git a/saedit/main.h b/saedit/main.h index f84ef5a..afa5a48 100644 --- a/saedit/main.h +++ b/saedit/main.h @@ -166,17 +166,11 @@ GtkWidget *source_view = NULL; GtkSourceBuffer *source_buffer = NULL; -//GList *imagesets = NULL; -//GList *actions = NULL; -//GList *animations = NULL; SAEInfo *gen_sae_info = NULL; SAEInfo *player = NULL; GdkPixbuf *icon = NULL; -//XMLNode *root = NULL; -//ImagesetInfo *imageset = NULL; -//guint running_animation = 0; Options *paths; Keys *config; diff --git a/saedit/saedit b/saedit/saedit index 7e7d1a8..8d0488f 100755 Binary files a/saedit/saedit and b/saedit/saedit differ -- cgit v1.2.3-70-g09d2