Fix crash in race dialog when no head or hair are available

9 years ago · 9eab3b1728
parent a45643f150
commit 9eab3b1728
1 changed files with 5 additions and 2 deletions
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@ -326,8 +326,11 @@ namespace MWGui
        record.mRace = mCurrentRaceId;
        record.setIsMale(mGenderIndex == 0);

-        record.mHead = mAvailableHeads[mFaceIndex];
-        record.mHair = mAvailableHairs[mHairIndex];
+        if (mFaceIndex >= 0 && mFaceIndex < int(mAvailableHeads.size()))
+            record.mHead = mAvailableHeads[mFaceIndex];
+
+        if (mHairIndex >= 0 && mHairIndex < int(mAvailableHairs.size()))
+            record.mHair = mAvailableHairs[mHairIndex];

        try
        {