1 files changed, 20 insertions, 19 deletions
diff --git a/pokemodr/MapTrainerTeamMemberUI.cpp b/pokemodr/MapTrainerTeamMemberUI.cpp
index c24cba21..65b6a6f1 100644
--- a/pokemodr/MapTrainerTeamMemberUI.cpp
+++ b/pokemodr/MapTrainerTeamMemberUI.cpp
@@ -42,6 +42,12 @@ MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* t, QWidget*
     QMetaObject::connectSlotsByName(this);
     setObjects(mapTrainerTeamMember, mapTrainerTeamMember_mod);
     connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
+    init();
+}
+
+void MapTrainerTeamMemberUI::refreshGui()
+{
+    varSpecies->clear();
     for (int i = 0; i < mapTrainerTeamMember->getPokemod()->getSpeciesCount(); ++i)
     {
         const Species* s = mapTrainerTeamMember->getPokemod()->getSpecies(i);
@@ -49,6 +55,19 @@ MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* t, QWidget*
         varSpecies->setItemData(i, s->getId());
     }
     varLevel->setMaximum(mapTrainerTeamMember->getPokemod()->getRules()->getMaxLevel());
+}
+
+void MapTrainerTeamMemberUI::setGui()
+{
+    varSpecies->setCurrentIndex(varSpecies->findData(mapTrainerTeamMember_mod->getSpecies()));
+    varLevel->setValue(mapTrainerTeamMember_mod->getLevel());
+    varNature->setCurrentIndex(varNature->findData(mapTrainerTeamMember_mod->getNature()));
+    for (int i = 0; i < varItems->count(); ++i)
+    {
+        QListWidgetItem* lwi = varItems->item(i);
+        lwi->setSelected(mapTrainerTeamMember_mod->getItem(lwi->data(Qt::UserRole).toInt()));
+    }
+    varNature->clear();
     if (mapTrainerTeamMember->getPokemod()->getRules()->getNatureAllowed())
     {
         for (int i = 0; i < mapTrainerTeamMember->getPokemod()->getNatureCount(); ++i)
@@ -60,6 +79,7 @@ MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* t, QWidget*
     }
     else
         boxNature->setEnabled(false);
+    varItems->clear();
     if (mapTrainerTeamMember->getPokemod()->getRules()->getHoldItems())
     {
         for (int i = 0; i < mapTrainerTeamMember->getPokemod()->getItemCount(); ++i)
@@ -71,25 +91,6 @@ MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* t, QWidget*
     }
     else
         boxItems->setEnabled(false);
-    setGui();
-    emit(changed(false));
-}
-
-// KToolbar getToolbar(QWidget* parent)
-// {
-//     
-// }
-
-void MapTrainerTeamMemberUI::setGui()
-{
-    varSpecies->setCurrentIndex(varSpecies->findData(mapTrainerTeamMember_mod->getSpecies()));
-    varLevel->setValue(mapTrainerTeamMember_mod->getLevel());
-    varNature->setCurrentIndex(varNature->findData(mapTrainerTeamMember_mod->getNature()));
-    for (int i = 0; i < varItems->count(); ++i)
-    {
-        QListWidgetItem* lwi = varItems->item(i);
-        lwi->setSelected(mapTrainerTeamMember_mod->getItem(lwi->data(Qt::UserRole).toInt()));
-    }
 }
 
 void MapTrainerTeamMemberUI::on_buttonApply_clicked()