From dadcce442975765f569e8de30ea1c79327e98f86 Mon Sep 17 00:00:00 2001
From: Santiago <santiago@ebizmarts.com>
Date: Tue, 13 Sep 2016 13:26:11 -0300
Subject: [PATCH] =?UTF-8?q?Problem=20with=20mixed=20emails=20sent=20when?=
 =?UTF-8?q?=20made=20simultaneously=20on=20checkout=20s=E2=80=A6=20?=
 =?UTF-8?q?=E2=80=A6olved.=20closes=20#60?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ebizmarts/MailChimp/Model/Email/Queue.php          | 10 +++-------
 app/code/community/Ebizmarts/MailChimp/etc/config.xml  |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Email/Queue.php b/app/code/community/Ebizmarts/MailChimp/Model/Email/Queue.php
index 73cf0dc7e..ed9cb6cc8 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Email/Queue.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Email/Queue.php
@@ -147,12 +147,8 @@ public function getMail($storeId)
         if (!Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::MANDRILL_ACTIVE, $storeId)) {
             return parent::getMail();
         }
-        if ($this->_mail) {
-            return $this->_mail;
-        } else {
-            Mage::helper('mailchimp/mandrill')->log("store: $storeId API: " . Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::MANDRILL_APIKEY, $storeId));
-            $this->_mail = new Mandrill_Message(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::MANDRILL_APIKEY, $storeId));
-            return $this->_mail;
-        }
+        Mage::helper('mailchimp/mandrill')->log("store: $storeId API: " . Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::MANDRILL_APIKEY, $storeId));
+        $this->_mail = new Mandrill_Message(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::MANDRILL_APIKEY, $storeId));
+        return $this->_mail;
     }
 }
diff --git a/app/code/community/Ebizmarts/MailChimp/etc/config.xml b/app/code/community/Ebizmarts/MailChimp/etc/config.xml
index e0f7214d0..0f735d6af 100755
--- a/app/code/community/Ebizmarts/MailChimp/etc/config.xml
+++ b/app/code/community/Ebizmarts/MailChimp/etc/config.xml
@@ -3,10 +3,10 @@
 <config>
     <modules>
         <Ebizmarts_MailChimp>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
         </Ebizmarts_MailChimp>
         <Ebizmarts_Mandrill>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
         </Ebizmarts_Mandrill>
     </modules>
     <global>