diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp index 519b5096..eb6f040b 100644 --- a/launcher/icons/IconList.cpp +++ b/launcher/icons/IconList.cpp @@ -28,6 +28,7 @@ IconList::IconList(const QStringList &builtinPaths, QString path, QObject *parent) : QAbstractListModel(parent) { QSet builtinNames; + m_logoIcon = QIcon(":/logo.svg"); builtinNames.insert("logo"); // add builtin icons @@ -329,6 +330,7 @@ bool IconList::addThemeIcon(const QString& key) beginInsertRows(QModelIndex(), icons.size(), icons.size()); { MMCIcon mmc_icon; + mmc_icon.m_logoIcon = m_logoIcon; mmc_icon.m_name = key; mmc_icon.m_key = key; mmc_icon.replace(Builtin, key); @@ -360,6 +362,7 @@ bool IconList::addIcon(const QString &key, const QString &name, const QString &p beginInsertRows(QModelIndex(), icons.size(), icons.size()); { MMCIcon mmc_icon; + mmc_icon.m_logoIcon = m_logoIcon; mmc_icon.m_name = name; mmc_icon.m_key = key; mmc_icon.replace(type, icon, path); diff --git a/launcher/icons/IconList.h b/launcher/icons/IconList.h index ebbb52e2..6fffef2d 100644 --- a/launcher/icons/IconList.h +++ b/launcher/icons/IconList.h @@ -84,4 +84,5 @@ private: QMap name_index; QVector icons; QDir m_dir; + QIcon m_logoIcon; }; diff --git a/launcher/icons/MMCIcon.cpp b/launcher/icons/MMCIcon.cpp index 4944ad54..2025df5d 100644 --- a/launcher/icons/MMCIcon.cpp +++ b/launcher/icons/MMCIcon.cpp @@ -17,8 +17,6 @@ #include #include -QIcon logoIcon = QIcon(":/logo.svg"); - IconType operator--(IconType &t, int) { IconType temp = t; @@ -62,7 +60,7 @@ QIcon MMCIcon::icon() const } if(m_current_type == IconType::Builtin && m_key == "logo") { - return logoIcon; + return m_logoIcon; } auto & icon = m_images[m_current_type].icon; if(!icon.isNull()) diff --git a/launcher/icons/MMCIcon.h b/launcher/icons/MMCIcon.h index 05109c2f..36f63369 100644 --- a/launcher/icons/MMCIcon.h +++ b/launcher/icons/MMCIcon.h @@ -39,6 +39,7 @@ struct MMCImage struct MMCIcon { + QIcon m_logoIcon; QString m_key; QString m_name; MMCImage m_images[ICONS_TOTAL];