[hop] branch master updated: additional display checks for pipeline and workflow graphs. #2944

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 8cb48142a9 additional display checks for pipeline and workflow graphs. 
#2944
     new 6feacdfc87 Merge pull request #3021 from bamaer/master
8cb48142a9 is described below

commit 8cb48142a90fdb729cb5a21b19ba68406925fb8c
Author: Bart Maertens <bart.maert...@know.bi>
AuthorDate: Wed Jun 21 20:30:55 2023 +0200

    additional display checks for pipeline and workflow graphs. #2944
---
 .../org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java | 6 +++++-
 .../org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
 
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
index c85b0b07bd..8eaa4bef6d 100644
--- 
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
+++ 
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
@@ -3647,8 +3647,12 @@ public class HopGuiPipelineGraph extends 
HopGuiAbstractGraph
       return false;
     }
 
+    Shell shell = hopGui.getDisplay().getActiveShell();
+    if(shell == null){
+      shell = hopGui.getShell();
+    }
     PipelineDialog tid =
-        new PipelineDialog(hopGui.getDisplay().getActiveShell(), SWT.NONE, 
variables, pipelineMeta, currentTab);
+        new PipelineDialog(shell, SWT.NONE, variables, pipelineMeta, 
currentTab);
     if (tid.open() != null) {
       hopGui.setParametersAsVariablesInUI(pipelineMeta, variables);
       updateGui();
diff --git 
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
 
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
index 82feefb8c3..e5e1e22e60 100644
--- 
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
+++ 
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
@@ -3180,7 +3180,11 @@ public class HopGuiWorkflowGraph extends 
HopGuiAbstractGraph
       return false;
     }
 
-    WorkflowDialog jd = new 
WorkflowDialog(hopGui.getDisplay().getActiveShell(), SWT.NONE, variables, 
workflowMeta);
+    Shell shell = hopGui.getDisplay().getActiveShell();
+    if(shell == null){
+      shell = hopGui.getShell();
+    }
+    WorkflowDialog jd = new WorkflowDialog(shell, SWT.NONE, variables, 
workflowMeta);
     if (jd.open() != null) {
       // If we added properties, add them to the variables too, so that they 
appear in the
       // CTRL-SPACE variable completion.