1 files changed, 9 insertions, 5 deletions
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index 696b8c2bf..c3b5ea064 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -85,7 +85,7 @@ void CharacterDisplay::setCharacter(Net::Character *const character)
         return;
 
     mCharacter = character;
-    mPlayerBox->setPlayer(character ? character->dummy : nullptr);
+    mPlayerBox->setPlayer(character != nullptr ? character->dummy : nullptr);
     update();
 }
 
@@ -99,7 +99,7 @@ void CharacterDisplay::setActive(const bool active A_UNUSED)
 
 void CharacterDisplay::update()
 {
-    if (mCharacter)
+    if (mCharacter != nullptr)
         mName->setCaption(mCharacter->dummy->getName());
     else
         mName->setCaption("");
@@ -111,20 +111,24 @@ void CharacterDisplay::update()
 
 void CharacterDisplay::widgetHidden(const Event &event A_UNUSED)
 {
-    if (textPopup)
+    if (textPopup != nullptr)
         textPopup->setVisible(Visible_false);
 }
 
 void CharacterDisplay::mouseExited(MouseEvent &event A_UNUSED)
 {
-    if (textPopup)
+    if (textPopup != nullptr)
         textPopup->setVisible(Visible_false);
 }
 
 void CharacterDisplay::mouseMoved(MouseEvent &event A_UNUSED)
 {
-    if (!gui || !textPopup || !mCharacter)
+    if (gui == nullptr ||
+        textPopup == nullptr ||
+        mCharacter == nullptr)
+    {
         return;
+    }
 
     int mouseX = 0;
     int mouseY = 0;