From 9bb11133522836a9c5e251550ac88c9a4e091c0e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 30 May 2014 12:46:49 +0300
Subject: Move main window related code into windowmanager.

---
 src/input/joystick.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/input')

diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp
index c9f2a85e7..626321c69 100644
--- a/src/input/joystick.cpp
+++ b/src/input/joystick.cpp
@@ -25,8 +25,11 @@
 #include "client.h"
 #include "configuration.h"
 #include "logger.h"
+#include "settings.h"
 #include "sdlshared.h"
 
+#include "gui/windowmanager.h"
+
 #include "input/inputmanager.h"
 #include "input/inputtype.h"
 
@@ -169,7 +172,7 @@ void Joystick::logic()
 
     mDirection = 0;
 
-    if (mUseInactive || client->getInputFocused())
+    if (mUseInactive || settings.inputFocused)
     {
         // X-Axis
         int position = SDL_JoystickGetAxis(mJoystick, 0);
@@ -338,7 +341,7 @@ bool Joystick::validate() const
     if (mCalibrating || !mEnabled || !mCalibrated)
         return false;
 
-    return (mUseInactive || client->getInputFocused());
+    return (mUseInactive || settings.inputFocused);
 }
 
 void Joystick::handleRepeat(const int time)
-- 
cgit v1.2.3-60-g2f50