X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/38a465378241d4c74b07fd7e4deaf2af09ff2bcb..ba19b133bf87936dc606dd994f56f433a278b768:/src/gui/lbxgui.c

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index ca6edec..bb9e5e5 100644
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -1,7 +1,7 @@
 /*
  *  2ooM: The Master of Orion II Reverse Engineering Project
  *  Graphical tool for inspecting LBX archives.
- *  Copyright (C) 2010 Nick Bowler
+ *  Copyright (C) 2010, 2014 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -29,8 +29,6 @@
 
 #include "bg.xbm"
 
-extern char lbxgui_xml[];
-
 static GtkTreeStore *archives;
 static GtkBuilder *builder;
 
@@ -102,12 +100,12 @@ static void tick(void *p, double delta)
 		elapsed -= seconds_per_frame;
 
 		if (++newframe >= image->frames) {
-			if (!info.looping) {
+			if (image->leadin == image->frames - 1) {
 				gtk_toggle_button_set_active(play, FALSE);
 				break;
 			}
 
-			newframe = info.loopstart;
+			newframe = image->leadin;
 		}
 	}
 
@@ -466,6 +464,7 @@ static void init_background(GdkDrawable *drawable)
 
 int main(int argc, char **argv)
 {
+	extern char lbxgui_glade[];
 	GtkWidget *window;
 	GError *err = NULL;
 
@@ -480,7 +479,7 @@ int main(int argc, char **argv)
 		load_archive(*argv++);
 
 	builder = gtk_builder_new();
-	if (!gtk_builder_add_from_string(builder, lbxgui_xml, -1, &err)) {
+	if (!gtk_builder_add_from_string(builder, lbxgui_glade, -1, &err)) {
 		fprintf(stderr, "%s\n", err->message);
 		return EXIT_FAILURE;
 	}