From: Jim Evins <evins@snaught.com>
Date: Sat, 8 Sep 2012 01:35:22 +0000 (-0400)
Subject: Fixed calculation of number of pages when printing merge jobs
X-Git-Tag: glabels-3_0_1~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9e853cf05c6fd883f4023b436b06b1195b7c6c2f;p=glabels

Fixed calculation of number of pages when printing merge jobs

Fixes bug #680585.  Poorly placed parenthesis caused the calculation of the
number of sheets to be wrong whenever starting on any label other than the
first one on a page.
---

diff --git a/src/print-op-dialog.c b/src/print-op-dialog.c
index fdcc45a7..df6cc256 100644
--- a/src/print-op-dialog.c
+++ b/src/print-op-dialog.c
@@ -478,7 +478,11 @@ custom_widget_apply_cb (GtkPrintOperation *operation,
                 gl_print_op_set_collate_flag (GL_PRINT_OP (op), collate_flag);
 
                 n_records = gl_merge_get_record_count (merge);
-                n_sheets = ceil (first - 1 + (n_copies * n_records)/(double)op->priv->labels_per_sheet);
+                n_sheets = ceil ((first - 1 + n_copies*n_records)/(double)op->priv->labels_per_sheet);
+                if ( n_sheets < 1 )
+                {
+	                n_sheets = 1;
+                }
                 gl_print_op_set_n_sheets     (GL_PRINT_OP (op), n_sheets);
 
                 g_object_unref (G_OBJECT(merge));