From 679327ec0edf22e2bc2d5e9616607f7aac4b0bd3 Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 14 Dec 2015 00:28:11 +0000 Subject: [PATCH] Prevent crash if card image not found for avatar image --- forge-gui-mobile/src/forge/screens/match/MatchController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 1f0e181b543..e01fbc49e0f 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -20,6 +20,7 @@ import forge.GuiBase; import forge.LobbyPlayer; import forge.assets.FImage; import forge.assets.FSkin; +import forge.assets.FSkinImage; import forge.assets.FSkinProp; import forge.assets.FTextureRegionImage; import forge.assets.ImageCache; @@ -94,6 +95,9 @@ public class MatchController extends AbstractGuiGame { } else { //handle lobby players with art from cards avatar = CardRenderer.getCardArt(p.getAvatarCardImageKey(), false, false); + if (avatar == null) { //use unknown avatar image if card image doesn't exist + avatar = FSkinImage.UNKNOWN; + } } } return avatar;