From afa175b4374f5c72dc776084abfbb2a8b9191af1 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Mon, 5 Apr 2021 13:27:42 +0200
Subject: [PATCH] Fixed an issue when switching theme sets while editing a
 custom collection.

---
 es-app/src/guis/GuiMenu.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index ea726b623..94497f2b9 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -190,6 +190,12 @@ void GuiMenu::openUISettings()
                 Settings::getInstance()->setString("ThemeSet", theme_set->getSelected());
                 CollectionSystemsManager::get()->updateSystemsList();
                 mWindow->setChangedThemeSet();
+                // This is required so that the custom collection system does not disappear
+                // if the user is editing a custom collection when switching theme sets.
+                if (CollectionSystemsManager::get()->isEditing()) {
+                    CollectionSystemsManager::get()->exitEditMode();
+                    s->setNeedsCollectionsUpdate();
+                }
                 s->setNeedsSaving();
                 s->setNeedsReloading();
                 s->setNeedsGoToStart();