fix(gui): resolve various minor issues

2022-06-20 13:17:50 +01:00
parent 4679172d4f
commit 8486891728
5 changed files with 27 additions and 6 deletions
@@ -29,9 +29,12 @@ public final class JadxTokenMaker extends JavaTokenMaker {

 	@Override
 	public Token getTokenList(Segment text, int initialTokenType, int startOffset) {
+		if (codeArea.isDisposed()) {
+			return new TokenImpl();
+		}
 		try {
 			Token tokens = super.getTokenList(text, initialTokenType, startOffset);
-			if (tokens.getType() != TokenTypes.NULL) {
+			if (tokens != null && tokens.getType() != TokenTypes.NULL) {
 				processTokens(tokens);
 			}
 			return tokens;