From da90d2f800b9d242be7ee82f45c7a705e3613f09 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Thu, 3 Oct 2019 12:02:35 -0400
Subject: [PATCH] GT-3197 - Call Trees - review fixes

Fixes #1087
---
 .../help/help/topics/CallTreePlugin/Call_Tree_Plugin.html     | 2 +-
 .../java/ghidra/app/plugin/core/calltree/CallTreePlugin.java  | 4 ++--
 .../src/main/java/docking/help/GHelpHTMLEditorKit.java        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CallTreePlugin/Call_Tree_Plugin.html b/Ghidra/Features/Base/src/main/help/help/topics/CallTreePlugin/Call_Tree_Plugin.html
index 2a044dc028..f12779a248 100644
--- a/Ghidra/Features/Base/src/main/help/help/topics/CallTreePlugin/Call_Tree_Plugin.html
+++ b/Ghidra/Features/Base/src/main/help/help/topics/CallTreePlugin/Call_Tree_Plugin.html
@@ -45,7 +45,7 @@
 	  	<UL>
 	  		<LI>
 	  		When launched from the toolbar icon, the provider that is shown will track the 
-	  		current location in the Listing (the the <IMG src="images/locationIn.gif" border="1">
+	  		current location in the Listing (the <IMG src="images/locationIn.gif" border="1">
 		      <A href="#Call_Tree_Action_Incoming_Navigation">Navigate on Incoming Location Changes 
       			button</A> is on).
 	  		</LI>
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreePlugin.java
index fa41fd3741..4ccb8adc70 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreePlugin.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreePlugin.java
@@ -111,8 +111,8 @@ public class CallTreePlugin extends ProgramPlugin {
 
 	CallTreeProvider findTransientProviderForLocation(ProgramLocation location) {
 		for (CallTreeProvider provider : providers) {
-			if (provider == primaryProvider) {
-				continue; // not transient
+			if (!provider.isTransient()) {
+				continue;
 			}
 
 			if (provider.isShowingLocation(location)) {
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/help/GHelpHTMLEditorKit.java b/Ghidra/Framework/Docking/src/main/java/docking/help/GHelpHTMLEditorKit.java
index a29e5f705e..1c4abca00c 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/help/GHelpHTMLEditorKit.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/help/GHelpHTMLEditorKit.java
@@ -397,7 +397,7 @@ public class GHelpHTMLEditorKit extends HTMLEditorKit {
 		 * anything.    
 		 * 
 		 * To get the base class to use our image, we override getImage().  However, we should 
-		 * only return our image when the base class is finished loaded.  (See the base class'
+		 * only return our image when the base class is finished loading.  (See the base class'
 		 * paint() method for why we need to do this.)
 		 * 
 		 * Note: if we start seeing unusual behavior, like images not rendering, or any size