From 0c4780a39ea260b6f59f3274e9e1f2f6dfa356e5 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 18 Aug 2013 23:42:44 +0000
Subject: [PATCH] Auto signing in, happens in the background on startup now.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13505 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp          | 3 +--
 src/online/current_user.hpp          | 2 +-
 src/online/http_manager.cpp          | 1 +
 src/online/request.cpp               | 2 ++
 src/states_screens/online_screen.cpp | 3 ---
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 809825526..6d3cdea61 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -93,7 +93,7 @@ namespace Online{
     }
 
     // ============================================================================
-    const CurrentUser::SignInRequest * CurrentUser::requestSavedSession()
+    void CurrentUser::requestSavedSession()
     {
         SignInRequest * request = NULL;
         if(getUserState() != US_SIGNED_IN  && UserConfigParams::m_saved_session)
@@ -106,7 +106,6 @@ namespace Online{
             HTTPManager::get()->addRequest(request);
             setUserState (US_SIGNING_IN);
         }
-        return request;
     }
 
     CurrentUser::SignInRequest * CurrentUser::requestSignIn(    const irr::core::stringw &username,
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index 2f9314f6f..de6e6cf8d 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -134,7 +134,7 @@ namespace Online{
             static CurrentUser *            get();
             static void                     deallocate();
 
-            const SignInRequest *           requestSavedSession();
+            void                            requestSavedSession();
             SignInRequest *                 requestSignIn(  const irr::core::stringw &username,
                                                             const irr::core::stringw &password,
                                                             bool save_session,
diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
index e6d94ea16..ef7aba5be 100644
--- a/src/online/http_manager.cpp
+++ b/src/online/http_manager.cpp
@@ -57,6 +57,7 @@ namespace Online{
         {
             http_singleton = new HTTPManager();
             http_singleton->startNetworkThread();
+            CurrentUser::get()->requestSavedSession();
         }
         return http_singleton;
     }   // get
diff --git a/src/online/request.cpp b/src/online/request.cpp
index 04d35b1e0..6141397df 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -75,7 +75,9 @@ namespace Online{
     bool HTTPRequest::isAllowedToAdd()
     {
         if (!Request::isAllowedToAdd() || m_url.size() < 5 || ( m_url.substr(0, 5) != "http:"))
+        {
             return false;
+        }
         return true;
     }
 
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index dbc34d085..c111223b0 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -57,9 +57,6 @@ DEFINE_SCREEN_SINGLETON( OnlineScreen );
 OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 {
     m_recorded_state = CurrentUser::US_SIGNED_OUT;
-    const CurrentUser::SignInRequest * request = CurrentUser::get()->requestSavedSession();
-    if(request != NULL)
-        m_requests.push_back(request);
 }   // OnlineScreen
 
 // ----------------------------------------------------------------------------