From bfdee54a34531631a021f9f112186504cebde4c7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 23 Aug 2017 18:42:30 +0300
Subject: Add partial adding items into new mail message.

---
 src/gui/windows/itemamountwindow.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/gui/windows/itemamountwindow.cpp')

diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index d31e263c4..100ad748a 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/windows/itemamountwindow.h"
 
+#include "settings.h"
+
 #include "being/playerinfo.h"
 
 #include "input/keyboardconfig.h"
@@ -47,6 +49,7 @@
 #include "gui/widgets/slider.h"
 
 #include "net/inventoryhandler.h"
+#include "net/mail2handler.h"
 #include "net/npchandler.h"
 
 #include "resources/item/item.h"
@@ -104,8 +107,14 @@ void ItemAmountWindow::finish(Item *const item,
                 item->getInvIndex(), amount, InventoryType::Inventory);
             break;
         case ItemAmountWindowUsage::MailAdd:
-            if (mailEditWindow != nullptr)
+            if (settings.enableNewMailSystem)
+            {
+                mail2Handler->addItem(item, amount);
+            }
+            else if (mailEditWindow != nullptr)
+            {
                 mailEditWindow->addItem(item, amount);
+            }
             break;
         case ItemAmountWindowUsage::CraftAdd:
         {
-- 
cgit v1.2.3-60-g2f50