From 1ca783531fafa84e0c431f5e778b049105e7e368 Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Mon, 29 Apr 2019 13:31:34 -0400
Subject: [PATCH] GT-2841: askDomainFile now correctly throws
 CancelledException.

---
 .../Base/src/main/java/ghidra/app/script/GhidraScript.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java
index 80973df175..baa9b4f23f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java
@@ -2818,6 +2818,11 @@ public abstract class GhidraScript extends FlatProgramAPI {
 
 			Runnable r = () -> dtd.showComponent();
 			SystemUtilities.runSwingNow(r);
+
+			if (dtd.wasCancelled()) {
+				throw new CancelledException();
+			}
+
 			return ref.get();
 		});