From bfa86e2a282af54ad6820e2cce411e4e0681b266 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 4 Jul 2016 19:25:19 +0100
Subject: [PATCH] Show 1 page when "One Page" selected

---
 src/avenprcore.cc | 6 +++++-
 src/printing.cc   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/avenprcore.cc b/src/avenprcore.cc
index d1a8b83f..9daf622d 100644
--- a/src/avenprcore.cc
+++ b/src/avenprcore.cc
@@ -1,6 +1,6 @@
 /* avenprcore.cc
  * Printer independent parts of Survex printer drivers
- * Copyright (C) 1993-2002,2004,2005,2006,2010,2011,2012,2013,2014,2015 Olly Betts
+ * Copyright (C) 1993-2002,2004,2005,2006,2010,2011,2012,2013,2014,2015,2016 Olly Betts
  * Copyright (C) 2004 Philip Underwood
  *
  * This program is free software; you can redistribute it and/or modify
@@ -113,6 +113,10 @@ layout::pages_required() {
 void
 layout::pick_scale(int x, int y)
 {
+   pagesX = x;
+   pagesY = y;
+   pages = x * y;
+
    double Sc_x, Sc_y;
    /*    pagesY = ceil((image_dy+allow)/PaperDepth)
     * so (image_dy+allow)/PaperDepth <= pagesY < (image_dy+allow)/PaperDepth+1
diff --git a/src/printing.cc b/src/printing.cc
index 7d7885fa..e0ba5caa 100644
--- a/src/printing.cc
+++ b/src/printing.cc
@@ -856,8 +856,8 @@ svxPrintDlg::SomethingChanged(int control_id) {
 	RecalcBounds();
 
 	if (m_scale) {
-	    (m_scale->GetValue()).ToDouble(&(m_layout.Scale));
-	    if (m_layout.Scale == 0.0) {
+	    if (!(m_scale->GetValue()).ToDouble(&(m_layout.Scale)) ||
+		m_layout.Scale == 0.0) {
 		m_layout.pick_scale(1, 1);
 	    }
 	}
-- 
2.11.4.GIT