From 39264f3828461d3fe55850dcdb73fe7dc70c6bc8 Mon Sep 17 00:00:00 2001 From: LMH Date: Fri, 3 Jan 2014 07:24:43 -1000 Subject: [PATCH] Revert "Speed improvement: Moving check online to different thread" Temporarily reverting changes to addon_menu.cpp until they can be built on platforms other than OS X Mavericks. This reverts commit 6d4d72e1670b7661049efdb378056b3a4333b467. --- src/supertux/menu/addon_menu.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/supertux/menu/addon_menu.cpp b/src/supertux/menu/addon_menu.cpp index e6ba6c577..a3cc6d5fa 100644 --- a/src/supertux/menu/addon_menu.cpp +++ b/src/supertux/menu/addon_menu.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include "addon/addon.hpp" @@ -32,12 +31,6 @@ bool generate_addons_menu_sorter(const Addon* a1, const Addon* a2) return a1->title < a2->title; } -void check_online() // Shortcut to expensive function to be called by a thread -{ - AddonManager::get_instance().check_online(); -} - - } // namespace AddonMenu::AddonMenu() : @@ -139,8 +132,7 @@ AddonMenu::check_menu() { try { - std::thread addonThread(check_online); - addonThread.join(); + AddonManager::get_instance().check_online(); refresh(); set_active_item(index); } -- 2.11.0