From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 23 Mar 2017 20:40:10 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_2~3^2~141^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e48d34b3938b4ac05a3dcaf3ab29e6317080f229;hp=4f6eaa801f36f7b460b662af6a24c45c1947dbd1;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 54eed1a..9a38d4c 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -549,7 +549,16 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
   public void run()
   {
     PrinterJob printJob = PrinterJob.getPrinterJob();
-    PageFormat pf = printJob.pageDialog(printJob.defaultPage());
+    PageFormat defaultPage = printJob.defaultPage();
+    PageFormat pf = printJob.pageDialog(defaultPage);
+
+    if (defaultPage == pf)
+    {
+      /*
+       * user cancelled
+       */
+      return;
+    }
 
     printJob.setPrintable(this, pf);