Protected combobox changes to avoid calls on error states

10 files changed, 28 insertions, 14 deletions

diff --git a/sigmodr/widgets/BadgeUI.cpp b/sigmodr/widgets/BadgeUI.cpp
index 5cf77eb8..d1dea1d0 100644
--- a/sigmodr/widgets/BadgeUI.cpp
+++ b/sigmodr/widgets/BadgeUI.cpp
@@ -189,12 +189,14 @@ void BadgeUI::obeyChanged(const int obey)
 
 void BadgeUI::faceChanged(const int face)
 {
-    qobject_cast<Badge*>(modified())->setFace(game()->sprite(face)->id());
+    if (0 <= face)
+        qobject_cast<Badge*>(modified())->setFace(game()->sprite(face)->id());
 }
 
 void BadgeUI::badgeChanged(const int badge)
 {
-    qobject_cast<Badge*>(modified())->setBadge(game()->sprite(badge)->id());
+    if (0 <= badge)
+        qobject_cast<Badge*>(modified())->setBadge(game()->sprite(badge)->id());
 }
 
 void BadgeUI::statChanged(const int row)
diff --git a/sigmodr/widgets/ItemUI.cpp b/sigmodr/widgets/ItemUI.cpp
index 7903b94d..4dda8c51 100644
--- a/sigmodr/widgets/ItemUI.cpp
+++ b/sigmodr/widgets/ItemUI.cpp
@@ -135,7 +135,8 @@ void ItemUI::sellableChanged(const bool sellable)
 
 void ItemUI::typeChanged(const int type)
 {
-    qobject_cast<Item*>(modified())->setType(game()->itemType(type)->id());
+    if (0 <= type)
+        qobject_cast<Item*>(modified())->setType(game()->itemType(type)->id());
 }
 
 void ItemUI::priceChanged(const int price)
diff --git a/sigmodr/widgets/MapEffectUI.cpp b/sigmodr/widgets/MapEffectUI.cpp
index b9c574b6..075bc96f 100644
--- a/sigmodr/widgets/MapEffectUI.cpp
+++ b/sigmodr/widgets/MapEffectUI.cpp
@@ -103,7 +103,8 @@ void MapEffectUI::nameChanged(const QString& name)
 
 void MapEffectUI::skinChanged(const int skin)
 {
-    qobject_cast<MapEffect*>(modified())->setSkin(game()->skin(skin)->id());
+    if (0 <= skin)
+        qobject_cast<MapEffect*>(modified())->setSkin(game()->skin(skin)->id());
 }
 
 void MapEffectUI::scriptChanged(const Script& script)
diff --git a/sigmodr/widgets/MapTrainerTeamMemberUI.cpp b/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
index be615a90..3148bc61 100644
--- a/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
+++ b/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
@@ -214,7 +214,8 @@ void MapTrainerTeamMemberUI::discard()
 
 void MapTrainerTeamMemberUI::speciesChanged(const int species)
 {
-    qobject_cast<MapTrainerTeamMember*>(modified())->setSpecies(game()->species(species)->id());
+    if (0 <= species)
+        qobject_cast<MapTrainerTeamMember*>(modified())->setSpecies(game()->species(species)->id());
 }
 
 void MapTrainerTeamMemberUI::levelChanged(const int level)
diff --git a/sigmodr/widgets/MapTrainerUI.cpp b/sigmodr/widgets/MapTrainerUI.cpp
index eef28ecf..fcb46cb1 100644
--- a/sigmodr/widgets/MapTrainerUI.cpp
+++ b/sigmodr/widgets/MapTrainerUI.cpp
@@ -142,7 +142,8 @@ void MapTrainerUI::nameChanged(const QString& name)
 
 void MapTrainerUI::trainerClassChanged(const int trainerClass)
 {
-    qobject_cast<MapTrainer*>(modified())->setTrainerClass(game()->trainer(trainerClass)->id());
+    if (0 <= trainerClass)
+        qobject_cast<MapTrainer*>(modified())->setTrainerClass(game()->trainer(trainerClass)->id());
 }
 
 void MapTrainerUI::numberFightChanged(const int numberFight)
diff --git a/sigmodr/widgets/MapWarpUI.cpp b/sigmodr/widgets/MapWarpUI.cpp
index 4018fb5b..4dc9bb43 100644
--- a/sigmodr/widgets/MapWarpUI.cpp
+++ b/sigmodr/widgets/MapWarpUI.cpp
@@ -131,14 +131,18 @@ void MapWarpUI::typeChanged(const int type)
 
 void MapWarpUI::toMapChanged(const int toMap)
 {
-    qobject_cast<MapWarp*>(modified())->setToMap(game()->map(toMap)->id());
+    if (0 <= toMap)
+        qobject_cast<MapWarp*>(modified())->setToMap(game()->map(toMap)->id());
 }
 
 void MapWarpUI::toWarpChanged(const int toWarp)
 {
-    const Map* map = game()->map(qobject_cast<MapWarp*>(modified())->toMap());
-    if (map)
-        qobject_cast<MapWarp*>(modified())->setToWarp(map->warp(toWarp)->id());
+    if (0 <= toWarp)
+    {
+        const Map* map = game()->map(qobject_cast<MapWarp*>(modified())->toMap());
+        if (map)
+            qobject_cast<MapWarp*>(modified())->setToWarp(map->warp(toWarp)->id());
+    }
 }
 
 void MapWarpUI::scriptChanged(const Script& script)
diff --git a/sigmodr/widgets/MapWildListEncounterUI.cpp b/sigmodr/widgets/MapWildListEncounterUI.cpp
index a2753ba1..7ef68a39 100644
--- a/sigmodr/widgets/MapWildListEncounterUI.cpp
+++ b/sigmodr/widgets/MapWildListEncounterUI.cpp
@@ -91,7 +91,8 @@ void MapWildListEncounterUI::discard()
 
 void MapWildListEncounterUI::speciesChanged(const int species)
 {
-    qobject_cast<MapWildListEncounter*>(modified())->setSpecies(game()->species(species)->id());
+    if (0 <= species)
+        qobject_cast<MapWildListEncounter*>(modified())->setSpecies(game()->species(species)->id());
 }
 
 void MapWildListEncounterUI::levelChanged(const int level)
diff --git a/sigmodr/widgets/MoveUI.cpp b/sigmodr/widgets/MoveUI.cpp
index 2bcdc4d4..9a9c09dd 100644
--- a/sigmodr/widgets/MoveUI.cpp
+++ b/sigmodr/widgets/MoveUI.cpp
@@ -143,7 +143,8 @@ void MoveUI::powerChanged(const int power)
 
 void MoveUI::typeChanged(const int type)
 {
-    qobject_cast<Move*>(modified())->setType(game()->type(type)->id());
+    if (0 <= type)
+        qobject_cast<Move*>(modified())->setType(game()->type(type)->id());
 }
 
 void MoveUI::powerPointsChanged(const int powerPoints)
diff --git a/sigmodr/widgets/SpeciesMoveUI.cpp b/sigmodr/widgets/SpeciesMoveUI.cpp
index 7154da23..cfe7d42b 100644
--- a/sigmodr/widgets/SpeciesMoveUI.cpp
+++ b/sigmodr/widgets/SpeciesMoveUI.cpp
@@ -92,7 +92,8 @@ void SpeciesMoveUI::discard()
 
 void SpeciesMoveUI::moveChanged(const int move)
 {
-    qobject_cast<SpeciesMove*>(modified())->setMove(game()->move(move)->id());
+    if (0 <= move)
+        qobject_cast<SpeciesMove*>(modified())->setMove(game()->move(move)->id());
 }
 
 void SpeciesMoveUI::levelChanged(const int level)
diff --git a/sigmodr/widgets/TrainerUI.cpp b/sigmodr/widgets/TrainerUI.cpp
index 041763eb..be7822bf 100644
--- a/sigmodr/widgets/TrainerUI.cpp
+++ b/sigmodr/widgets/TrainerUI.cpp
@@ -124,7 +124,8 @@ void TrainerUI::moneyFactorChanged(const int moneyFactor)
 
 void TrainerUI::skinChanged(const int skin)
 {
-    qobject_cast<Trainer*>(modified())->setSkin(game()->skin(skin)->id());
+    if (0 <= skin)
+        qobject_cast<Trainer*>(modified())->setSkin(game()->skin(skin)->id());
 }
 
 void TrainerUI::depthChanged(const int depth)