- Fixing a pretty hard NPE crash. Not sure what scenario this occurs, but it basically spawned a crash report in high order

This commit is contained in:
Sol
2013-02-22 17:47:55 +00:00
parent ed75aa48e0
commit cf50a39ad4

View File

@@ -313,8 +313,8 @@ public class CardPanel extends JPanel implements CardContainer {
// + White borders for Core sets Unlimited - 9th +
final int cornerSize = Math.max(4, Math.round(this.cardWidth * CardPanel.ROUNDED_CORNER_SIZE));
if (this.getGameCard() != null && (!this.getGameCard().getImageFilename().equals("none"))
&& (!this.getGameCard().getName().equals("Morph"))) {
if (this.getGameCard() != null && this.getGameCard().getImageFilename() != null
&& !this.getGameCard().getImageFilename().equals("none") && !this.getGameCard().getName().equals("Morph")) {
CardEdition ed = Singletons.getModel().getEditions().get(this.getGameCard().getCurSetCode());
if (ed != null && ed.isWhiteBorder()) {