Work around #1626

2014-10-14 19:59:42 -04:00
parent 607e94ea84
commit 514d0c4dfe
2 changed files with 2 additions and 1 deletions
--- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
@@ -1085,7 +1085,7 @@ bool DynamicRibbonWidget::setSelection(int item_id, const int playerID,

        if (iterations > 50)
        {
-            Log::fatal("DynamicRibbonWidget::setSelection", "Cannot find item %d (%s)", item_id, name.c_str());
+            Log::error("DynamicRibbonWidget::setSelection", "Cannot find item %d (%s)", item_id, name.c_str());
            return false;
        }

--- a/src/states_screens/options_screen_video.cpp
+++ b/src/states_screens/options_screen_video.cpp
@@ -310,6 +310,7 @@ void OptionsScreenVideo::init()

    } // end if not inited

+    res->setActivated();
    res->updateItemDisplay();

    // ---- select current resolution every time