external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixnpe' into 'master'

Browse Source 
Fix NPE

See merge request core-developers/forge!5156
This commit is contained in:
Bug Hunter
2021-08-01 06:53:21 +00:00
parent 9f39857dad 0114d8c9db
commit 7a615c3a7c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/ImageCache.java
View File

@@ -165,7 +165,7 @@ public class ImageCache {
if (StringUtils.isBlank(imageKey)) { if (StringUtils.isBlank(imageKey)) {
return _defaultImage; return _defaultImage;
} }
} else if (imageKey.startsWith(ImageKeys.TOKEN_PREFIX) && cardView.isToken()) { } else if (imageKey.startsWith(ImageKeys.TOKEN_PREFIX) && cardView != null && cardView.isToken()) {
ipc = ImageUtil.getPaperTokenFromImageKey(imageKey); ipc = ImageUtil.getPaperTokenFromImageKey(imageKey);
} }