9 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index 6ba7a2ffb..31ca8552a 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -389,7 +389,7 @@ void Font::generate(TextChunk &chunk)
     {
         TextChunk *const chunk2 = (*i).second;
         cache->moveToFirst(chunk2);
-        //search.erase(key);
+//        search.erase(key);
         cache->remove(chunk2);
         chunk.img = chunk2->img;
         chunk2->img = nullptr;
diff --git a/src/gui/fonts/textchunklist.cpp b/src/gui/fonts/textchunklist.cpp
index 023727282..24b46bea0 100644
--- a/src/gui/fonts/textchunklist.cpp
+++ b/src/gui/fonts/textchunklist.cpp
@@ -70,7 +70,7 @@ void TextChunkList::moveToFirst(TextChunk *const item)
     start = item;
 }
 
-void TextChunkList::remove(TextChunk *const item)
+void TextChunkList::remove(const TextChunk *const item)
 {
     if (!item)
         return;
diff --git a/src/gui/fonts/textchunklist.h b/src/gui/fonts/textchunklist.h
index 1f5eff0ea..cbc7b9ebf 100644
--- a/src/gui/fonts/textchunklist.h
+++ b/src/gui/fonts/textchunklist.h
@@ -40,7 +40,7 @@ class TextChunkList final
 
         void moveToFirst(TextChunk *const item);
 
-        void remove(TextChunk *const item);
+        void remove(const TextChunk *const item);
 
         void removeBack();
 
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 1a8c613ba..446f4756f 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -643,7 +643,7 @@ void Button::draw(Graphics *graphics)
     if (image)
         graphics->drawImage(image, textX, textY);
 
-    //font->drawString(graphics, mCaption, textX, textY);
+//    font->drawString(graphics, mCaption, textX, textY);
     BLOCK_END("Button::draw")
 }
 
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index c97741548..153195454 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -206,7 +206,7 @@ class Button final : public Widget,
          * @see getCaption, adjustSize
          */
         void setCaption(const std::string& caption)
-        { mCaption = caption; mTextChanged = true;}
+        { mCaption = caption; mTextChanged = true; }
 
         /**
          * Gets the caption of the button.
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index e361c78ff..21b51d79a 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -252,7 +252,7 @@ void Tab::draw(Graphics *graphics)
                     mLabel->setForegroundColorAll(*mPlayerFlashColor,
                         *mPlayerFlashOutlineColor);
                     break;
-                case 3:  //mTabbedArea->isTabSelected(this)
+                case 3:  // mTabbedArea->isTabSelected(this)
                     mLabel->setForegroundColorAll(*mTabSelectedColor,
                         *mTabSelectedOutlineColor);
                     break;
diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp
index 70aac5aa2..cbf301b27 100644
--- a/src/gui/widgets/widget.cpp
+++ b/src/gui/widgets/widget.cpp
@@ -187,7 +187,7 @@ bool Widget::isFocused() const
 
 void Widget::setFocusable(const bool focusable)
 {
-    if (!focusable && isFocused())
+    if (!focusable && isFocused() && mFocusHandler)
         mFocusHandler->focusNone();
     mFocusable = focusable;
 }
@@ -220,7 +220,7 @@ void Widget::requestMoveToBottom()
 
 void Widget::setVisible(bool visible)
 {
-    if (!visible && isFocused())
+    if (!visible && isFocused() && mFocusHandler)
         mFocusHandler->focusNone();
 
     if (visible)
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index d6bc01e95..5ba652072 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -26,6 +26,8 @@
 
 #include "input/inputaction.h"
 
+#include "enums/being/beingdirection.h"
+
 #include "enums/gui/dialogtype.h"
 
 #include "gui/windows/okdialog.h"
@@ -382,7 +384,7 @@ void CharCreateDialog::action(const ActionEvent &event)
                 Modal_true,
                 ShowCenter_true,
                 nullptr,
-                260))->postInit();;
+                260))->postInit();
         }
     }
     else if (id == "cancel")
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 198df1508..7a1c798ec 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -55,8 +55,6 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
-#include <SDL_timer.h>
-
 #include "debug.h"
 
 StatusWindow *statusWindow = nullptr;