summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <jstebbins.hb@gmail.com>2008-09-29 18:24:25 +0000
committerjstebbins <jstebbins.hb@gmail.com>2008-09-29 18:24:25 +0000
commitc655326c577f2ecb8cff06487f44dad4b9142f4b (patch)
treed16baa61b9fa9fd5de7db7c98ba46ed31504b60c
parenteac44be1bada7e322819ef1031c021e5fb1bd257 (diff)
LinGui: fix a small scanning status display problem and a compiler warning.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1785 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--gtk/src/callbacks.c9
-rw-r--r--gtk/src/x264handler.c1
2 files changed, 9 insertions, 1 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 28d62ba8d..c8d5e9cbe 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1520,8 +1520,15 @@ ghb_backend_events(signal_user_data_t *ud)
// Then handle the status of the queue
if (status.state & GHB_STATE_SCANNING)
{
- status_str = g_strdup_printf ("Scanning title %d of %d...",
+ if (status.title_cur == 0)
+ {
+ status_str = g_strdup ("Scanning...");
+ }
+ else
+ {
+ status_str = g_strdup_printf ("Scanning title %d of %d...",
status.title_cur, status.title_count );
+ }
gtk_progress_bar_set_text (progress, status_str);
g_free(status_str);
if (status.title_count > 0)
diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 4a75520f0..8f8576c94 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -16,6 +16,7 @@
#include "settings.h"
#include "values.h"
#include "callbacks.h"
+#include "presets.h"
#include "x264handler.h"
static void x264_opt_update(signal_user_data_t *ud, GtkWidget *widget);