From ba57657b4f2322b7b980cca5f0e839c4b74e7384 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Mon, 31 Dec 2018 07:40:44 -0600 Subject: Correct logic of mod conflict color selection --- src/modlist.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/modlist.cpp') diff --git a/src/modlist.cpp b/src/modlist.cpp index 44ca6eaf..fd39654e 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -411,25 +411,15 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const bool archiveOverwritten = m_ArchiveOverwritten.find(modIndex) != m_ArchiveOverwritten.end(); bool archiveLooseOverwritten = m_ArchiveLooseOverwritten.find(modIndex) != m_ArchiveLooseOverwritten.end(); if (modInfo->getHighlight() & ModInfo::HIGHLIGHT_PLUGIN) { - return Settings::instance().modlistContainsPluginColor(); - } else if (overwritten || archiveLooseOverwritten) { - - return Settings::instance().modlistOverwrittenLooseColor(); - - } else if (overwrite || archiveLooseOverwrite) { - return Settings::instance().modlistOverwritingLooseColor(); - + } else if (overwrite || archiveLooseOverwrite) { + return Settings::instance().modlistOverwrittenLooseColor(); } else if (archiveOverwritten) { - - return Settings::instance().modlistOverwrittenArchiveColor(); - - } else if (archiveOverwrite) { - return Settings::instance().modlistOverwritingArchiveColor(); - + } else if (archiveOverwrite) { + return Settings::instance().modlistOverwrittenArchiveColor(); } else if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR) && modInfo->getColor().isValid() && ((role != ViewMarkingScrollBar::DEFAULT_ROLE) -- cgit v1.3.1