From 14833a4c3abbae15a5d000e00f80649f8117acb1 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 2 Oct 2012 10:20:49 +0200
Subject: [PATCH] Issue #61: More robust tools handling in alchemy window

---
 apps/openmw/mwgui/alchemywindow.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 93eee60ee..2aa46fda0 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -62,6 +62,8 @@ namespace MWGui
 
     void AlchemyWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
+        mAlchemy.clear();
+        
         mWindowManager.removeGuiMode(GM_Alchemy);
         mWindowManager.removeGuiMode(GM_Inventory);
     }
@@ -265,9 +267,9 @@ namespace MWGui
         {
             if (!iter->isEmpty())
             {
-                mApparatus[index]->setUserString ("ToolTipType", "ItemPtr");
-                mApparatus[index]->setUserData (*iter);
-                mApparatus[index]->setImageTexture (getIconPath (*iter));
+                mApparatus.at (index)->setUserString ("ToolTipType", "ItemPtr");
+                mApparatus.at (index)->setUserData (*iter);
+                mApparatus.at (index)->setImageTexture (getIconPath (*iter));
             }
         }
     }