Merge pull request #1303 from leyyin/master

Fix some bugs in the online screens

data/gui/online/guest_login.stkgui

@@ -39,6 +39,6 @@ or collect any achievements while being online."
     </box>
 </div>
 
-<icon-button id="back" x="0" y="0" height="15%" icon="gui/back.png"/>
+<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
 </stkgui>

src/audio/music_information.cpp

@@ -81,6 +81,7 @@ MusicInformation::MusicInformation(const XMLNode *root,
     m_normal_music    = NULL;
     m_fast_music      = NULL;
     m_enable_fast     = false;
+    m_music_waiting   = false;
     m_faster_time     = 1.0f;
     m_max_pitch       = 0.1f;
     m_gain            = 1.0f;

src/states_screens/guest_login_screen.cpp

@@ -68,6 +68,10 @@ void GuestLoginScreen::eventCallback(Widget* widget, const std::string& name,
         else if(button=="cancel")
             StateManager::get()->escapePressed();
     }
+    else if (name == "back")
+    {
+        StateManager::get()->escapePressed();
+    }
 
 }   // eventCallback
 

src/states_screens/login_screen.cpp

@@ -179,6 +179,10 @@ void LoginScreen::eventCallback(Widget* widget, const std::string& name,
         else if(button=="cancel")
             StateManager::get()->escapePressed();
     }
+    else if (name == "back")
+    {
+        StateManager::get()->escapePressed();
+    }
 
 }   // eventCallback
 

src/states_screens/register_screen.cpp

@@ -201,6 +201,10 @@ void RegisterScreen::eventCallback(Widget* widget, const std::string& name,
         else if(button=="cancel")
             StateManager::get()->escapePressed();
     }
+    else if (name == "back")
+    {
+        StateManager::get()->escapePressed();
+    }
 
 }   // eventCallback