diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2022-03-31 13:19:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 13:19:38 -0500 |
| commit | 2afecbfb630015be167dfb05203edfe0264b6321 (patch) | |
| tree | 0dcf3f6f6b7a3c29ed28c0f480f2b554e9dbb6a9 | |
| parent | 68d0b838cf5abf01c4956a9f079fa76fef340a2e (diff) | |
| parent | 70f39f33a645627d72a4acc2d865bf399d3fbb3d (diff) | |
Merge pull request #720 from AttorneyOnline/fix-subthemes
Fix subthemes not appearing in the settings box
| -rw-r--r-- | src/aooptionsdialog.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index 7604fc72..e2ae7506 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -108,12 +108,13 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) // Fill the combobox with the names of the themes. ui_subtheme_combobox->addItem("server"); ui_subtheme_combobox->addItem("default"); - QDirIterator it2(ao_app->get_base_path() + "themes/" + ao_app->current_theme, QDir::Dirs, + QDirIterator it2(ao_app->get_real_path(ao_app->get_theme_path("")), QDir::Dirs, QDirIterator::NoIteratorFlags); while (it2.hasNext()) { QString actualname = QDir(it2.next()).dirName(); - if (actualname != "." && actualname != ".." && actualname.toLower() != "server" && actualname.toLower() != "default" && actualname.toLower() != "effects" && actualname.toLower() != "misc") + if (actualname != "." && actualname != ".." && actualname.toLower() != "server" && actualname.toLower() != "default" && actualname.toLower() != "effects" && actualname.toLower() != "misc") { ui_subtheme_combobox->addItem(actualname); + } } ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_subtheme_combobox); @@ -1319,7 +1320,7 @@ void AOOptionsDialog::theme_changed(int i) { // Fill the combobox with the names of the themes. ui_subtheme_combobox->addItem("server"); ui_subtheme_combobox->addItem("default"); - QDirIterator it(ao_app->get_base_path() + "themes/" + ui_theme_combobox->itemText(i), QDir::Dirs, + QDirIterator it(ao_app->get_real_path(ao_app->get_theme_path("", ui_theme_combobox->itemText(i))), QDir::Dirs, QDirIterator::NoIteratorFlags); while (it.hasNext()) { QString actualname = QDir(it.next()).dirName(); |