diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | src/organizercore.cpp | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5eaa5755..28596127 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2114,9 +2114,14 @@ void MainWindow::refreshFilters() ModInfo::Ptr modInfo = ModInfo::getByIndex(modIdx);
for (int categoryID : modInfo->getCategories()) {
int currentID = categoryID;
+ std::set<int> cycleTest;
// also add parents so they show up in the tree
while (currentID != 0) {
categoriesUsed.insert(currentID);
+ if (!cycleTest.insert(currentID).second) {
+ qWarning("cycle in categories: %s", qPrintable(SetJoin(cycleTest, ", ")));
+ break;
+ }
currentID = m_CategoryFactory.getParentID(m_CategoryFactory.getCategoryIndex(currentID));
}
}
diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 0b2d2610..b3bcc917 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -327,7 +327,6 @@ void OrganizerCore::updateExecutablesList(QSettings &settings) int numCustomExecutables = settings.beginReadArray("customExecutables");
for (int i = 0; i < numCustomExecutables; ++i) {
settings.setArrayIndex(i);
-
ExecutableInfo::CloseMOStyle closeMO =
settings.value("closeOnStart").toBool() ? ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE
: ExecutableInfo::CloseMOStyle::DEFAULT_STAY;
@@ -337,13 +336,15 @@ void OrganizerCore::updateExecutablesList(QSettings &settings) if (settings.value("toolbar", false).toBool()) flags |= Executable::ShowInToolbar;
if (settings.value("ownicon", false).toBool()) flags |= Executable::UseApplicationIcon;
+ if (settings.value("ownicon", false).toBool()) flags |= Executable::UseApplicationIcon;
+
m_ExecutablesList.configureExecutable(settings.value("title").toString(),
settings.value("binary").toString(),
settings.value("arguments").toString(),
settings.value("workingDirectory", "").toString(),
- closeMO,
+ closeMO,
settings.value("steamAppID", "").toString(),
- flags);
+ flags);
}
settings.endArray();
|