From bcbd1e87a6984f4a2b6544b1411fc180c0e3181f Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Mon, 7 Jan 2019 06:52:39 +0400
Subject: [PATCH] Merge fix

---
 .../src/main/java/mage/client/dialog/ConnectDialog.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
index 981d34781e..471ad2d3c6 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
@@ -36,6 +36,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
 import mage.cards.repository.CardRepository;
+import mage.cards.repository.ExpansionRepository;
 import mage.choices.Choice;
 import mage.choices.ChoiceImpl;
 import mage.client.MageFrame;
@@ -456,7 +457,9 @@ public class ConnectDialog extends MageDialog {
             connection.setPort(Integer.valueOf(this.txtPort.getText().trim()));
             connection.setUsername(this.txtUserName.getText().trim());
             connection.setPassword(this.txtPassword.getText().trim());
-            boolean redownloadDatabase = CardRepository.instance.findCard("Island") == null;
+
+            // force to redownload db
+            boolean redownloadDatabase = (ExpansionRepository.instance.getSetByCode("GRN") == null || CardRepository.instance.findCard("Island") == null);
             connection.setForceDBComparison(this.chkForceUpdateDB.isSelected() || redownloadDatabase);
             String allMAC = "";
             try {