[Xfce4-commits] [apps/xfburn] 03/03: Make some iso errors fatal again, small comment update.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

squisher pushed a commit to branch master
in repository apps/xfburn.

commit 303ae69b5d362692fd6aa7046dc2d4d45a30c439
Author: David Mohr <david at mcbf.net>
Date:   Sat Apr 5 00:15:57 2014 -0600

    Make some iso errors fatal again, small comment update.
---
 xfburn/xfburn-burn-data-composition-base-dialog.c |    5 +++++
 xfburn/xfburn-data-composition.c                  |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/xfburn/xfburn-burn-data-composition-base-dialog.c b/xfburn/xfburn-burn-data-composition-base-dialog.c
index f9cad63..ecdd18b 100644
--- a/xfburn/xfburn-burn-data-composition-base-dialog.c
+++ b/xfburn/xfburn-burn-data-composition-base-dialog.c
@@ -574,6 +574,11 @@ thread_burn_prep_and_burn (ThreadBurnCompositionParams * params, struct burn_dri
   */
   burn_write_opts_set_simulate(burn_options, params->dummy ? 1 : 0);
   burn_write_opts_set_underrun_proof (burn_options, params->burnfree ? 1 : 0);
+  /*
+   * 32 is the number of blocks to skip. This will increase reliability with BD disks that
+   * are used for multisessions. xfburn doesn't support this, but other programs may be using
+   * the disc that way, so we respect that here.
+   */
   burn_write_opts_set_stream_recording (burn_options, params->stream_recording ? 32 : 0);
 
   if (!xfburn_set_write_mode (burn_options, params->write_mode, disc, WRITE_MODE_TAO)) {
diff --git a/xfburn/xfburn-data-composition.c b/xfburn/xfburn-data-composition.c
index e5ab751..57884b0 100644
--- a/xfburn/xfburn-data-composition.c
+++ b/xfburn/xfburn-data-composition.c
@@ -1932,11 +1932,11 @@ fill_image_with_composition (GtkTreeModel *model, IsoImage *image, IsoDir * pare
         char * msg;
 
         if (r == ISO_NULL_POINTER)
-          msg = g_strdup_printf (_("%s: null pointer"), src);
+          g_error (_("%s: null pointer"), src);
+        else if (r == ISO_OUT_OF_MEM)
+          g_error (_("%s: out of memory"), src);
         else if (r == ISO_NODE_NAME_NOT_UNIQUE)
           msg = g_strdup_printf (_("%s: node name not unique"), src);
-        else if (r == ISO_OUT_OF_MEM)
-          msg = g_strdup_printf (_("%s: out of memory"), src);
         else
           msg = g_strdup_printf (_("%s: %s (code %X)"), src, iso_error_to_msg(r), r);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.