X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fcallbacks.c;h=54a5d0ca223f11ce3ff2a4d07f3bd2ba26475e7c;hb=9b9e605f16338e7f9f9f43ebf9ac5949d649a86b;hp=2eddda904b3ad84ada3561467a70a771b0dcac46;hpb=dfdbf320b1479ffcb9617069ffd1a318abfa7e1b;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 2eddda90..54a5d0ca 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1886,6 +1886,22 @@ ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, c
 	return TRUE;
 }
 
+void
+ghb_error_dialog(GtkMessageType type, const gchar *message, const gchar *cancel)
+{
+	GtkWidget *dialog;
+	GtkResponseType response;
+			
+	// Toss up a warning dialog
+	dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+							type, GTK_BUTTONS_NONE,
+							"%s", message);
+	gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+						   cancel, GTK_RESPONSE_CANCEL, NULL);
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	gtk_widget_destroy (dialog);
+}
+
 gboolean
 ghb_cancel_encode(const gchar *extra_msg)
 {
@@ -2180,11 +2196,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
 	{
@@ -3297,10 +3316,14 @@ ghb_is_cd(GDrive *gd)
 	LibHalDriveType dtype;
 
 	device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+	if (device == NULL)
+		return FALSE;
 	halDrive = libhal_drive_from_device_file (hal_ctx, device);
+	g_free(device);
+	if (halDrive == NULL)
+		return FALSE;
 	dtype = libhal_drive_get_type(halDrive);
 	libhal_drive_free(halDrive);
-	g_free(device);
 	return (dtype == LIBHAL_DRIVE_TYPE_CDROM);
 #else
 	return FALSE;