X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fcallbacks.c;h=4d14b12a68366aab43da714a4cae6120aa1d87a5;hb=8e6c0b5d94c0f683de6958c40fad027013b6c680;hp=59c29a3f5c808199ac078d0755ea40ca2b259e4c;hpb=a780f5821ddace3e4f8b701a25abc5002c9e9074;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 59c29a3f..4d14b12a 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -2180,11 +2180,14 @@ working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
 	gboolean subtitle_scan = FALSE;
 
 	qcount = ghb_array_len(ud->queue);
+	index = find_queue_job(ud->queue, status->unique_id, &js);
+	if (js != NULL)
+	{
+		subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan");
+	}
 	if (qcount > 1)
 	{
-		index = find_queue_job(ud->queue, status->unique_id, &js);
 		job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
-		subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan");
 	}
 	else
 	{
@@ -2242,11 +2245,18 @@ ghb_backend_events(signal_user_data_t *ud)
 	GtkTreeView *treeview;
 	GtkTreeStore *store;
 	GtkTreeIter iter;
-	static gint working = 0;
-	static gboolean work_started = FALSE;
+	static gint prev_scan_state = 0;
+	static gint prev_queue_state = 0;
 	
 	ghb_track_status();
 	ghb_get_status(&status);
+	if (prev_scan_state != status.scan.state ||
+		prev_queue_state != status.queue.state)
+	{
+		ghb_queue_buttons_grey(ud);
+		prev_scan_state = status.scan.state;
+		prev_queue_state = status.queue.state;
+	}
 	progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
 	work_status = GTK_LABEL(GHB_WIDGET (ud->builder, "work_status"));
 	if (status.scan.state == GHB_STATE_IDLE && 
@@ -2313,7 +2323,6 @@ ghb_backend_events(signal_user_data_t *ud)
 			gtk_label_set_text(label, "None");
 		}
 		ghb_clear_scan_state(GHB_STATE_SCANDONE);
-		ghb_queue_buttons_grey(ud, work_started);
 		if (ghb_queue_edit_settings)
 		{
 			gint jstatus;
@@ -2334,11 +2343,6 @@ ghb_backend_events(signal_user_data_t *ud)
 	{
 		// This needs to be in scanning and working since scanning
 		// happens fast enough that it can be missed
-		if (!work_started)
-		{
-			work_started = TRUE;
-			ghb_queue_buttons_grey(ud, TRUE);
-		}
 		gtk_label_set_text (work_status, "Scanning ...");
 		gtk_progress_bar_set_fraction (progress, 0);
 	}
@@ -2355,13 +2359,10 @@ ghb_backend_events(signal_user_data_t *ud)
 	}
 	else if (status.queue.state & GHB_STATE_WORKING)
 	{
+		static gint working = 0;
+
 		// This needs to be in scanning and working since scanning
 		// happens fast enough that it can be missed
-		if (!work_started)
-		{
-			work_started = TRUE;
-			ghb_queue_buttons_grey(ud, TRUE);
-		}
 		index = find_queue_job(ud->queue, status.queue.unique_id, &js);
 		if (status.queue.unique_id != 0 && index >= 0)
 		{
@@ -2398,8 +2399,6 @@ ghb_backend_events(signal_user_data_t *ud)
 	{
 		gint qstatus;
 
-		work_started = FALSE;
-		ghb_queue_buttons_grey(ud, FALSE);
 		index = find_queue_job(ud->queue, status.queue.unique_id, &js);
 		treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
 		store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));