1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index eee3e4259..8d4eae9c8 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -122,14 +122,14 @@ QuestsWindow::QuestsWindow() :
         getOptionBool("showtextbackground"), "quests_text_background.xml")),
     // TRANSLATORS: quests window button
     mCloseButton(new Button(this, _("Close"), "close", this)),
+    mCompleteIcon(Theme::getImageFromThemeXml("complete_icon.xml", "")),
+    mIncompleteIcon(Theme::getImageFromThemeXml("incomplete_icon.xml", "")),
     mVars(),
     mQuests(),
     mAllEffects(),
     mMapEffects(),
     mNpcEffects(),
     mQuestLinks(),
-    mCompleteIcon(Theme::getImageFromThemeXml("complete_icon.xml", "")),
-    mIncompleteIcon(Theme::getImageFromThemeXml("incomplete_icon.xml", "")),
     mNewQuestEffectId(paths.getIntValue("newQuestEffectId")),
     mCompleteQuestEffectId(paths.getIntValue("completeQuestEffectId")),
     mMap(nullptr)
@@ -149,12 +149,12 @@ QuestsWindow::QuestsWindow() :
     mQuestsListBox->setActionEventId("select");
     mQuestsListBox->addActionListener(this);
 
-    mQuestScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mQuestScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mText->setOpaque(false);
     mText->setLinkHandler(mItemLinkHandler);
-    mTextScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mTextScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mQuestsListBox->setWidth(500);
-    if (gui && gui->getNpcFont()->getHeight() < 20)
+    if (!gui || gui->getNpcFont()->getHeight() < 20)
         mQuestsListBox->setRowHeight(20);
     else
         mQuestsListBox->setRowHeight(gui->getNpcFont()->getHeight());