diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | src/modlist.cpp | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 9aa26db6..362fffe5 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1367,7 +1367,7 @@ void MainWindow::updateBSAList(const QStringList &defaultArchives, const QString std::sort(items.begin(), items.end(), BySortValue);
- for (std::vector<std::pair<UINT32, QTreeWidgetItem*> >::iterator iter = items.begin(); iter != items.end(); ++iter) {
+ for (auto iter = items.begin(); iter != items.end(); ++iter) {
int originID = iter->second->data(1, Qt::UserRole).toInt();
FilesOrigin origin = m_OrganizerCore.directoryStructure()->getOriginByID(originID);
@@ -1400,6 +1400,7 @@ void MainWindow::checkBSAList() if (archives != nullptr) {
ui->bsaList->blockSignals(true);
+ ON_BLOCK_EXIT([&] () { ui->bsaList->blockSignals(false); });
QStringList defaultArchives = archives->archives(m_OrganizerCore.currentProfile());
@@ -1433,8 +1434,6 @@ void MainWindow::checkBSAList() } else {
ui->tabWidget->setTabIcon(1, QIcon());
}
-
- ui->bsaList->blockSignals(false);
}
}
diff --git a/src/modlist.cpp b/src/modlist.cpp index c6beee8b..9ac2622d 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -634,7 +634,7 @@ void ModList::setOverwriteMarkers(const std::set<unsigned int> &overwrite, const {
m_Overwrite = overwrite;
m_Overwritten = overwritten;
- notifyChange(0, rowCount());
+ notifyChange(0, rowCount() - 1);
}
bool ModList::modInfoAboutToChange(ModInfo::Ptr info)
@@ -917,7 +917,8 @@ void ModList::notifyChange(int rowStart, int rowEnd) beginResetModel();
endResetModel();
} else {
- if (rowEnd == -1) rowEnd = rowStart;
+ if (rowEnd == -1)
+ rowEnd = rowStart;
emit dataChanged(this->index(rowStart, 0), this->index(rowEnd, this->columnCount() - 1));
}
}
@@ -985,6 +986,7 @@ QString ModList::getColumnToolTip(int column) "<tr><td><img src=\":/MO/gui/content/plugin\" width=32/></td><td>Game plugins (esp/esm)</tr>"
"<tr><td><img src=\":/MO/gui/content/interface\" width=32/></td><td>Interface</tr>"
"<tr><td><img src=\":/MO/gui/content/mesh\" width=32/></td><td>Meshes</tr>"
+ "<tr><td><img src=\":/MO/gui/content/bsa\" width=32/></td><td>BSA</tr>"
"<tr><td><img src=\":/MO/gui/content/texture\" width=32/></td><td>Textures</tr>"
"<tr><td><img src=\":/MO/gui/content/sound\" width=32/></td><td>Sounds</tr>"
"<tr><td><img src=\":/MO/gui/content/music\" width=32/></td><td>Music</tr>"
@@ -1093,5 +1095,5 @@ bool ModList::eventFilter(QObject *obj, QEvent *event) return toggleSelection(itemView);
}
}
- return QObject::eventFilter(obj, event);
+ return QAbstractItemModel::eventFilter(obj, event);
}
|