Add missing checks and non null attributes.

1 files changed, 16 insertions, 8 deletions

diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index eba1dd96e..2168ad0a1 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -268,20 +268,28 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
     if (serverFeatures->haveLookSelection() && mMinLook < mMaxLook)
     {
         y += 24;
-        mPrevLookButton->setPosition(leftX, y);
-        mNextLookButton->setPosition(rightX, y);
+        if (mPrevLookButton)
+            mPrevLookButton->setPosition(leftX, y);
+        if (mNextLookButton)
+            mNextLookButton->setPosition(rightX, y);
         y += 5;
-        mLookLabel->setPosition(labelX, y);
-        mLookNameLabel->setPosition(nameX, y);  // 93
+        if (mLookLabel)
+            mLookLabel->setPosition(labelX, y);
+        if (mLookNameLabel)
+            mLookNameLabel->setPosition(nameX, y);  // 93
     }
     if (serverFeatures->haveRaceSelection())
     {
         y += 24;
-        mPrevRaceButton->setPosition(leftX, y);
-        mNextRaceButton->setPosition(rightX, y);
+        if (mPrevRaceButton)
+            mPrevRaceButton->setPosition(leftX, y);
+        if (mNextRaceButton)
+            mNextRaceButton->setPosition(rightX, y);
         y += 5;
-        mRaceLabel->setPosition(labelX, y);
-        mRaceNameLabel->setPosition(nameX, y);
+        if (mRaceLabel)
+            mRaceLabel->setPosition(labelX, y);
+        if (mRaceNameLabel)
+            mRaceNameLabel->setPosition(nameX, y);
     }
 
     updateSliders();