yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1772_correct_langauge_usage'

Browse source 
Conflicts:
	Ghidra/Features/Base/ghidra_scripts/ReloadSleighLangauge.java
This commit is contained in:
Ryan Kurtz 2022-05-06 14:30:24 -04:00
commit 5e6c267093
8 changed files with 54 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/WatchRow.java
View file

@ -245,7 +245,7 @@ public class WatchRow {
Language newLanguage = trace.getBaseLanguage();
if (language != newLanguage) {
if (!(newLanguage instanceof SleighLanguage)) {
error = new RuntimeException("Not a sleigh-based langauge");
error = new RuntimeException("Not a sleigh-based language");
return;
}
language = (SleighLanguage) newLanguage;