From 51e5640c8e64f837ccec64d8ae376e09a4fbcb61 Mon Sep 17 00:00:00 2001
From: vraskulin <v.raskulin@gmail.com>
Date: Mon, 9 Jan 2017 15:17:59 +0300
Subject: [PATCH] We can't invoke equals method on object, that can be null,
 due it's lead to NPE

---
 .../org/mage/plugins/card/utils/CardImageUtils.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
index 759787d6186..74db210fe9e 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
@@ -3,6 +3,7 @@ package org.mage.plugins.card.utils;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.util.HashMap;
+import java.util.Objects;
 import java.util.prefs.Preferences;
 import mage.client.MageFrame;
 import mage.client.constants.Constants;
@@ -120,8 +121,9 @@ public class CardImageUtils {
 
     public static String getImageBasePath() {
         String useDefault = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_USE_DEFAULT, "true");
-        String imagesPath = useDefault.equals("true") ? Constants.IO.imageBaseDir : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null);
-        if (!imagesPath.endsWith(TFile.separator)) {
+        String imagesPath = Objects.equals(useDefault, "true") ? Constants.IO.imageBaseDir : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null);
+
+        if (imagesPath != null && !imagesPath.endsWith(TFile.separator)) {
             imagesPath += TFile.separator;
         }
         return imagesPath;
@@ -161,7 +163,7 @@ public class CardImageUtils {
 
     public static String generateImagePath(CardDownloadData card) {
         String useDefault = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_USE_DEFAULT, "true");
-        String imagesPath = useDefault.equals("true") ? null : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null);
+        String imagesPath = Objects.equals(useDefault, "true") ? null : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null);
 
         String imageDir = getImageDir(card, imagesPath);
         String imageName;
@@ -189,7 +191,7 @@ public class CardImageUtils {
 
     public static String generateTokenDescriptorImagePath(CardDownloadData card) {
         String useDefault = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_USE_DEFAULT, "true");
-        String imagesPath = useDefault.equals("true") ? null : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null);
+        String imagesPath = Objects.equals(useDefault, "true") ? null : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null);
 
         String straightImageFile = getTokenDescriptorImagePath(card);
         TFile file = new TFile(straightImageFile);