From 4d4a7713fb936f632dc655abd0196adada0784de Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Fri, 27 Mar 2015 16:36:55 +0100
Subject: bugfix: not all icons showed up

---
 src/icondelegate.cpp        | 6 ++++++
 src/mainwindow.cpp          | 2 +-
 src/modflagicondelegate.cpp | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/icondelegate.cpp b/src/icondelegate.cpp
index 794ac7f3..ef9011b6 100644
--- a/src/icondelegate.cpp
+++ b/src/icondelegate.cpp
@@ -45,10 +45,16 @@ void IconDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
 
   painter->translate(option.rect.topLeft());
   for (const QString &iconId : icons) {
+    if (iconId.isEmpty()) {
+      continue;
+    }
     QPixmap icon;
     QString fullIconId = QString("%1_%2").arg(iconId).arg(iconWidth);
     if (!QPixmapCache::find(fullIconId, &icon)) {
       icon = QIcon(iconId).pixmap(iconWidth, iconWidth);
+      if (icon.isNull()) {
+        qWarning("failed to load icon %s", qPrintable(iconId));
+      }
       QPixmapCache::insert(fullIconId, icon);
     }
     painter->drawPixmap(x, 2, iconWidth, iconWidth, icon);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1566bc8a..49bfe117 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1676,7 +1676,7 @@ bool MainWindow::modifyExecutablesDialog()
   try {
     EditExecutablesDialog dialog(*m_OrganizerCore.executablesList());
     if (dialog.exec() == QDialog::Accepted) {
-      m_OrganizerCore.setExecutablesDialog(dialog.getExecutablesList());
+      m_OrganizerCore.setExecutablesList(dialog.getExecutablesList());
       result = true;
     }
     refreshExecutablesList();
diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index e4c11bc5..d66c3ac5 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -41,8 +41,8 @@ QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag) const
 {
   switch (flag) {
     case ModInfo::FLAG_BACKUP: return ":/MO/gui/emblem_backup";
-    case ModInfo::FLAG_INVALID: return ":/MO/gui/emblem_problem";
-    case ModInfo::FLAG_NOTENDORSED: return "MO/gui/emblem_notendorsed";
+    case ModInfo::FLAG_INVALID: return ":/MO/gui/problem";
+    case ModInfo::FLAG_NOTENDORSED: return ":/MO/gui/emblem_notendorsed";
     case ModInfo::FLAG_NOTES: return ":/MO/gui/emblem_notes";
     case ModInfo::FLAG_CONFLICT_OVERWRITE: return ":/MO/gui/emblem_conflict_overwrite";
     case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return ":/MO/gui/emblem_conflict_overwritten";
-- 
cgit v1.3.1