From 55db3c2712a112d9b978bffacf903cb803edc0a6 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 25 Nov 2017 11:35:29 +0400
Subject: [PATCH] Set default values for class and birthsign select menus (bug
 #4226)

---
 apps/openmw/mwgui/birth.cpp | 10 +++++++++-
 apps/openmw/mwgui/class.cpp | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index 92f29e3ef..c1867541b 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -8,7 +8,9 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 
 #include "widgets.hpp"
 
@@ -70,8 +72,14 @@ namespace MWGui
         updateBirths();
         updateSpells();
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mBirthList);
-    }
 
+        // Show the current birthsign by default
+        const std::string &signId =
+            MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
+
+        if (!signId.empty())
+            setBirthId(signId);
+    }
 
     void BirthDialog::setBirthId(const std::string &birthId)
     {
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 33daa0ad1..4d2a15c82 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -7,6 +7,9 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+
+#include "../mwmechanics/actorutil.hpp"
+
 #include "../mwworld/esmstore.hpp"
 
 #include "tooltips.hpp"
@@ -131,8 +134,16 @@ namespace MWGui
         updateClasses();
         updateStats();
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mClassList);
-    }
 
+        // Show the current class by default
+        MWWorld::Ptr player = MWMechanics::getPlayer();
+
+        const std::string &classId =
+            player.get<ESM::NPC>()->mBase->mClass;
+
+        if (!classId.empty())
+            setClassId(classId);
+    }
 
     void PickClassDialog::setClassId(const std::string &classId)
     {