Skip to content

Commit da90d2f

Browse files
committed
GT-3197 - Call Trees - review fixes
Fixes NationalSecurityAgency#1087
1 parent ea8e2a8 commit da90d2f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Ghidra/Features/Base/src/main/help/help/topics/CallTreePlugin/Call_Tree_Plugin.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ <H1><A name="Call_Tree_Plugin"></A>Call Tree Plugin</H1>
4545
<UL>
4646
<LI>
4747
When launched from the toolbar icon, the provider that is shown will track the
48-
current location in the Listing (the the <IMG src="images/locationIn.gif" border="1">
48+
current location in the Listing (the <IMG src="images/locationIn.gif" border="1">
4949
<A href="#Call_Tree_Action_Incoming_Navigation">Navigate on Incoming Location Changes
5050
button</A> is on).
5151
</LI>

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreePlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ protected void dispose() {
111111

112112
CallTreeProvider findTransientProviderForLocation(ProgramLocation location) {
113113
for (CallTreeProvider provider : providers) {
114-
if (provider == primaryProvider) {
115-
continue; // not transient
114+
if (!provider.isTransient()) {
115+
continue;
116116
}
117117

118118
if (provider.isShowingLocation(location)) {

Ghidra/Framework/Docking/src/main/java/docking/help/GHelpHTMLEditorKit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ private class GHelpImageView extends ImageView {
397397
* anything.
398398
*
399399
* To get the base class to use our image, we override getImage(). However, we should
400-
* only return our image when the base class is finished loaded. (See the base class'
400+
* only return our image when the base class is finished loading. (See the base class'
401401
* paint() method for why we need to do this.)
402402
*
403403
* Note: if we start seeing unusual behavior, like images not rendering, or any size

0 commit comments

Comments
 (0)