summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl <26797547+Al12rs@users.noreply.github.com>2021-07-10 20:40:41 +0200
committerGitHub <noreply@github.com>2021-07-10 20:40:41 +0200
commit4e3d7d01804c46d3ea7aea70cef7db0314c7ae41 (patch)
tree248d36180d60c8519cc36b07fe8560cd3fdb09d0
parentb5d04eff4f3a1687c4604fbecc7699db03ede98e (diff)
parentb5cb1a2311aa6fd75b1a053ca73806ff3df23a52 (diff)
Merge pull request #1552 from ModOrganizer2/fix-no-compile
Fix compiler error due to using same name for new dialog (VS v16.10.3)
-rw-r--r--src/settingsdialoggeneral.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 30039575..27038918 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -139,10 +139,10 @@ void GeneralSettingsTab::resetDialogs()
void GeneralSettingsTab::onEditCategories()
{
- CategoriesDialog dialog(&dialog());
+ CategoriesDialog catDialog(&dialog());
- if (dialog.exec() == QDialog::Accepted) {
- dialog.commitChanges();
+ if (catDialog.exec() == QDialog::Accepted) {
+ catDialog.commitChanges();
}
}