summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modinfodialogconflicts.cpp3
-rw-r--r--src/modinfodialogconflicts.h13
2 files changed, 3 insertions, 13 deletions
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 358571d6..f7a27bf8 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -593,6 +593,8 @@ GeneralConflictsTab::GeneralConflictsTab(
void GeneralConflictsTab::clear()
{
+ m_counts.clear();
+
m_overwriteModel->clear();
m_overwrittenModel->clear();
m_noConflictModel->clear();
@@ -625,7 +627,6 @@ void GeneralConflictsTab::restoreState(const Settings& s)
bool GeneralConflictsTab::update()
{
clear();
- m_counts.clear();
if (m_tab->origin() != nullptr) {
const auto rootPath = m_tab->mod().absolutePath();
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index 5c0e9158..db195e3d 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -67,18 +67,7 @@ private:
int numOverwrittenArchive = 0;
void clear() {
- numTotalFiles = 0;
- numTotalLoose = 0;
- numTotalArchive = 0;
- numNonConflicting = 0;
- numNonConflictingLoose = 0;
- numNonConflictingArchive = 0;
- numOverwrite = 0;
- numOverwriteLoose = 0;
- numOverwriteArchive = 0;
- numOverwritten = 0;
- numOverwrittenLoose = 0;
- numOverwrittenArchive = 0;
+ *this = {};
};
};