From 7c7c71428afc4a6290d4f0972175b898819754d9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 13 Jul 2014 14:26:59 +0200
Subject: [PATCH] Don't crash if certain class doesn't exist

---
 apps/openmw/mwgui/levelupdialog.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index eaa822722..5c698258a 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -132,22 +132,23 @@ namespace MWGui
         const ESM::Class *cls =
             world->getStore().get<ESM::Class>().find(playerData->mClass);
 
-        // Vanilla uses thief.dds for custom classes.  A player with a custom class
-        // doesn't have mId set, see mwworld/esmstore.hpp where it is initialised as
-        // "$dynamic0".  This check should resolve bug #1260.
-        // Choosing Stealth specialization and Speed/Agility as attributes.
         if(world->getStore().get<ESM::Class>().isDynamic(cls->mId))
         {
+            // Vanilla uses thief.dds for custom classes.
+            // Choosing Stealth specialization and Speed/Agility as attributes, if possible. Otherwise fall back to first class found.
             MWWorld::SharedIterator<ESM::Class> it = world->getStore().get<ESM::Class>().begin();
             for(; it != world->getStore().get<ESM::Class>().end(); it++)
             {
                 if(it->mData.mIsPlayable && it->mData.mSpecialization == 2 && it->mData.mAttribute[0] == 4 && it->mData.mAttribute[1] == 3)
                     break;
             }
-            mClassImage->setImageTexture ("textures\\levelup\\" + it->mId + ".dds");
+            if (it == world->getStore().get<ESM::Class>().end())
+                it = world->getStore().get<ESM::Class>().begin();
+            if (it != world->getStore().get<ESM::Class>().end())
+                cls = &*it;
         }
-        else
-            mClassImage->setImageTexture ("textures\\levelup\\" + cls->mId + ".dds");
+
+        mClassImage->setImageTexture ("textures\\levelup\\" + cls->mId + ".dds");
 
         int level = creatureStats.getLevel ()+1;
         mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + boost::lexical_cast<std::string>(level));