2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index 4d2845656..eb7e163f0 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -78,8 +78,8 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
     }
     else
     {
-        unsigned sel = config.getIntValue("selectedJoystick");
-        if (sel >= mNamesModel->size())
+        unsigned int sel = config.getIntValue("selectedJoystick");
+        if (sel >= static_cast<unsigned int>(mNamesModel->size()))
             sel = 0;
         mNamesDropDown->setSelected(sel);
     }
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 77a758cb4..613e2c7f0 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -134,7 +134,8 @@ public:
             mWidgets.push_back(widget);
 
             DropDown *const choicebox = new DropDown(this, mListModel);
-            choicebox->setSelected(player_relations.getRelation(name));
+            choicebox->setSelected(static_cast<int>(
+                player_relations.getRelation(name)));
             mWidgets.push_back(choicebox);
         }