3 files changed, 22 insertions, 15 deletions

diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index c2a4b4636..01e5e052d 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -271,7 +271,8 @@ void InventoryWindow::postInit()
 InventoryWindow::~InventoryWindow()
 {
     invInstances.remove(this);
-    mInventory->removeInventoyListener(this);
+    if (mInventory)
+        mInventory->removeInventoyListener(this);
     if (!invInstances.empty())
         invInstances.front()->updateDropButton();
 
@@ -681,7 +682,10 @@ void InventoryWindow::close()
     else
     {
         if (Net::getInventoryHandler())
+        {
             Net::getInventoryHandler()->closeStorage(Inventory::STORAGE);
+            Net::getInventoryHandler()->forgotStorage();
+        }
         scheduleDelete();
     }
 }
@@ -806,3 +810,14 @@ void InventoryWindow::setVisible(bool visible)
         mSortDropDown->hideDrop();
     Window::setVisible(visible);
 }
+
+void InventoryWindow::unsetInventory()
+{
+    if (mInventory)
+    {
+        mInventory->removeInventoyListener(this);
+        if (mItems)
+            mItems->unsetInventory();
+    }
+    mInventory = nullptr;
+}
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 7e47e0362..10e1e21e2 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -152,6 +152,8 @@ class InventoryWindow final : public Window,
 
         void setVisible(bool visible) override final;
 
+        void unsetInventory();
+
         static bool isAnyInputFocused();
 
     private:
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 824d8e0f6..75460cf78 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -840,21 +840,11 @@ void UpdaterWindow::logic()
                 if (mUpdateIndex < mUpdateFiles.size())
                 {
                     UpdateFile thisFile = mUpdateFiles[mUpdateIndex];
-                    if (!thisFile.required)
+                    if (thisFile.type == "music"
+                        && !config.getBoolValue("download-music"))
                     {
-                        // This statement checks to see if the file type
-                        // is music, and if download-music is true
-                        // If it fails, this statement returns true,
-                        // and results in not downloading the file
-                        // Else it will ignore the break,
-                        // and download the file.
-
-                        if (!(thisFile.type == "music"
-                            && config.getBoolValue("download-music")))
-                        {
-                            mUpdateIndex++;
-                            break;
-                        }
+                        mUpdateIndex++;
+                        break;
                     }
                     mCurrentFile = thisFile.name;
                     std::string checksum;