git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4f6eaa8
)
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
author
kiramt
<k.mourao@dundee.ac.uk>
Thu, 23 Mar 2017 20:40:10 +0000
(20:40 +0000)
committer
kiramt
<k.mourao@dundee.ac.uk>
Thu, 23 Mar 2017 20:40:10 +0000
(20:40 +0000)
src/jalview/gui/TreeCanvas.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
54eed1a
..
9a38d4c
100755
(executable)
--- 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);