projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05ee827
)
Revert "Speed improvement: Moving check online to different thread"
author
LMH
<lmh.0013@gmail.com>
Fri, 3 Jan 2014 17:24:43 +0000
(07:24 -1000)
committer
Tobias Markus
<tobiasmarkus1@tobiass-mbp.fritz.box>
Fri, 24 Jan 2014 21:56:59 +0000
(22:56 +0100)
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
patch
|
blob
|
history
diff --git
a/src/supertux/menu/addon_menu.cpp
b/src/supertux/menu/addon_menu.cpp
index
e6ba6c5
..
a3cc6d5
100644
(file)
--- a/
src/supertux/menu/addon_menu.cpp
+++ b/
src/supertux/menu/addon_menu.cpp
@@
-18,7
+18,6
@@
#include <config.h>
#include <algorithm>
-#include <thread>
#include <boost/format.hpp>
#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);
}