Merge pull request #1561 from marcoll/master

Some minor corrections

src/guiengine/widgets/dynamic_ribbon_widget.cpp

@@ -497,6 +497,7 @@ void DynamicRibbonWidget::clearItems()
     m_items.clear();
     m_animated_contents = false;
     m_scroll_offset = 0;
+    GUIEngine::needsUpdate.remove(this);
 }
 // -----------------------------------------------------------------------------
 void DynamicRibbonWidget::elementRemoved()

src/race/grand_prix_manager.cpp

@@ -24,8 +24,7 @@
 
 #include <algorithm>
 #include <set>
-#include <utility>
+
-#include <sstream>
 
 GrandPrixManager *grand_prix_manager = NULL;
 

src/states_screens/edit_gp_screen.cpp

@@ -261,6 +261,10 @@ void EditGPScreen::loadList(const int selected)
         m_list->setSelectionID(selected);
         setSelected(selected);
     }
+    else
+    {
+        enableButtons();
+    }
 }
 
 // -----------------------------------------------------------------------------

src/states_screens/gp_info_screen.cpp

@@ -175,7 +175,7 @@ void GPInfoScreen::init()
         // been added or deleted since the last time this screen was shown.
         m_group_spinner->clearLabels();
         m_group_spinner->addLabel("all");
-        int index_standard;
+        int index_standard=0;
         const std::vector<std::string>& groups = track_manager->getAllTrackGroups();
         for (unsigned int i = 0; i < groups.size(); i++)
         {

src/states_screens/tracks_screen.cpp

@@ -67,9 +67,6 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name,
 
         if (selection == "random_track")
         {
-            RibbonWidget* tabs = getWidget<RibbonWidget>("trackgroups");
-            assert(tabs);
-
             if (m_random_track_list.empty()) return;
 
             std::string track = m_random_track_list.front();