Skin: Add default constructor and add validity checks

2 files changed, 8 insertions, 8 deletions

diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
index fb2b1158b0..6867dcbf8b 100644
--- a/src/preferences/dialog/dlgprefinterface.cpp
+++ b/src/preferences/dialog/dlgprefinterface.cpp
@@ -114,7 +114,7 @@ DlgPrefInterface::DlgPrefInterface(
     int index = 0;
     for (const Skin& skin : skins) {
         ComboBoxSkinconf->insertItem(index, skin.name());
-        m_skins.insert(skin.name(), std::optional(skin));
+        m_skins.insert(skin.name(), skin);
         index++;
     }
     qWarning() << m_skins.keys();
@@ -228,9 +228,9 @@ void DlgPrefInterface::slotUpdateSchemes() {
 void DlgPrefInterface::slotUpdate() {
     const QString skinNameOnUpdate =
             m_pConfig->getValueString(ConfigKey("[Config]", "ResizableSkin"));
-    const std::optional<Skin> skinOnUpdate = m_skins[skinNameOnUpdate];
-    if (skinOnUpdate) {
-        m_skinNameOnUpdate = (*skinOnUpdate).name();
+    const Skin skinOnUpdate = m_skins[skinNameOnUpdate];
+    if (skinOnUpdate.isValid()) {
+        m_skinNameOnUpdate = skinOnUpdate.name();
     } else {
         m_skinNameOnUpdate = m_pSkinLoader->getDefaultSkinName();
     }
@@ -352,11 +352,11 @@ void DlgPrefInterface::slotSetSkinDescription() {
 void DlgPrefInterface::slotSetSkin(int) {
     QString newSkinName = ComboBoxSkinconf->currentText();
     if (newSkinName != m_skin.name()) {
-        const std::optional<Skin> newSkin = m_skins[newSkinName];
-        VERIFY_OR_DEBUG_ASSERT(newSkin) {
+        const Skin newSkin = m_skins[newSkinName];
+        VERIFY_OR_DEBUG_ASSERT(newSkin.isValid()) {
             return;
         }
-        m_skin = *newSkin;
+        m_skin = newSkin;
         m_bRebootMixxxView = newSkinName != m_skinNameOnUpdate;
         const auto* const pScreen = getScreen();
         if (pScreen && m_skin.fitsScreenSize(*pScreen)) {
diff --git a/src/preferences/dialog/dlgprefinterface.h b/src/preferences/dialog/dlgprefinterface.h
index 25c0176b4b..12096af9e6 100644
--- a/src/preferences/dialog/dlgprefinterface.h
+++ b/src/preferences/dialog/dlgprefinterface.h
@@ -58,7 +58,7 @@ class DlgPrefInterface : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
     MixxxMainWindow *m_mixxx;
     std::shared_ptr<SkinLoader> m_pSkinLoader;
 
-    QMap<QString, std::optional<mixxx::skin::legacy::Skin>> m_skins;
+    QMap<QString, mixxx::skin::legacy::Skin> m_skins;
     mixxx::skin::legacy::Skin m_skin;
     QString m_skinNameOnUpdate;
     QString m_colorScheme;