From 15c83d4dfaf421e7d464b65515b3e1a9f058f2f3 Mon Sep 17 00:00:00 2001 From: TZVanaalten Date: Thu, 24 Aug 2017 14:19:31 +0100 Subject: [PATCH] JAL-2629 hmmsearch/build/align no longer run after cancelling --- src/jalview/gui/AlignFrame.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index d1d8a61..38e9423 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -1048,8 +1048,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, ParamDatastoreI store = new HMMERParamStore("hmmalign"); WsJobParameters params = new WsJobParameters(new JFrame(), store, set, args); - params.showRunDialog(); - new Thread(new HMMBuildThread(this, params.getJobParams())).start(); + if (params.showRunDialog()) + { + new Thread(new HMMBuildThread(this, params.getJobParams())).start(); + } alignPanel.repaint(); } @@ -1067,9 +1069,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, ParamDatastoreI store = new HMMERParamStore("hmmalign"); WsJobParameters params = new WsJobParameters(new JFrame(), store, set, args); - params.showRunDialog(); - new Thread(new HMMAlignThread(this, true, params.getJobParams())) + if (params.showRunDialog()) + { + new Thread(new HMMAlignThread(this, true, params.getJobParams())) .start(); + } alignPanel.repaint(); } @@ -1085,9 +1089,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, ParamDatastoreI store = new HMMERParamStore("hmmsearch"); WsJobParameters params = new WsJobParameters(new JFrame(), store, set, args); - params.showRunDialog(); - new Thread(new HMMSearchThread(this, true, params.getJobParams())) + if (params.showRunDialog()) + { + new Thread(new HMMSearchThread(this, true, params.getJobParams())) .start(); + } alignPanel.repaint(); } -- 1.7.10.2