From e0e8dff7686b6d9149f7d9cd2726400dd75229d2 Mon Sep 17 00:00:00 2001 From: unitraxx Date: Wed, 28 Aug 2013 00:23:31 +0000 Subject: [PATCH] Last bug filtered out! git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13579 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/guiengine/event_handler.cpp | 2 +- src/online/current_user.cpp | 2 +- src/states_screens/dialogs/login_dialog.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/guiengine/event_handler.cpp b/src/guiengine/event_handler.cpp index 72f9aae35..f0924eddb 100644 --- a/src/guiengine/event_handler.cpp +++ b/src/guiengine/event_handler.cpp @@ -734,7 +734,7 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event) if (playerID == -1) break; if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break; - if (ribbon->mouseHovered(w, playerID) == EVENT_LET) sendEventToUser(ribbon, ribbon->m_properties[PROP_ID], playerID); + ribbon->mouseHovered(w, playerID); if (ribbon->m_event_handler != NULL) ribbon->m_event_handler->mouseHovered(w, playerID); ribbon->setFocusForPlayer(playerID); } diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp index ae195e25e..a0b9e5ea0 100644 --- a/src/online/current_user.cpp +++ b/src/online/current_user.cpp @@ -102,7 +102,7 @@ namespace Online{ void CurrentUser::requestSavedSession() { SignInRequest * request = NULL; - if(m_state != US_SIGNED_IN && UserConfigParams::m_saved_session) + if(m_state == US_SIGNED_OUT && UserConfigParams::m_saved_session) { request = new SignInRequest(true); request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php"); diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp index aeb22d387..2dd8a4b00 100644 --- a/src/states_screens/dialogs/login_dialog.cpp +++ b/src/states_screens/dialogs/login_dialog.cpp @@ -155,8 +155,6 @@ GUIEngine::EventPropagation LoginDialog::processEvent(const std::string& eventSo void LoginDialog::onEnterPressedInternal() { - - //If enter was pressed while none of the buttons was focused interpret as sign_in event const int playerID = PLAYER_ID_GAME_MASTER; if (GUIEngine::isFocusedForPlayer(m_options_widget, playerID)) return;