[Performous-commit] Lasse Karkkainen : Remove --theme (was broken and didn't do anything).

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: f94a5de3503a14071c93c717768ce5479b93a981

Author: Lasse Karkkainen <tro...@tr...>
Date:   Thu Jan 14 04:03:13 2010 +0200

Remove --theme (was broken and didn't do anything).
Fix race condition in getPaths initialization by song loader and some other system.

---

 game/main.cc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/main.cc b/game/main.cc
index ba91912..7c0b9e8 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -234,8 +234,7 @@ int main(int argc, char** argv) {
 	  ("mics", po::value<std::vector<std::string> >(&mics)->composing(), "specify the microphones to use")
 	  ("pdev", po::value<std::vector<std::string> >(&pdevs)->composing(), "specify the playback device")
 	  ("michelp", "detailed help and device list for --mics")
-	  ("pdevhelp", "detailed help and device list for --pdev")
-	  ("theme", po::value<std::string>(), "set theme (name or absolute path)");
+	  ("pdevhelp", "detailed help and device list for --pdev");
 	po::options_description opt3("Hidden options");
 	opt3.add_options()
 	  ("songdir", po::value<std::vector<std::string> >(&songdirs)->composing(), "");
@@ -309,6 +308,7 @@ int main(int argc, char** argv) {
 	confOverride(songdirs, "system/path_songs");
 	confOverride(mics, "audio/capture");
 	confOverride(pdevs, "audio/playback");
+	getPaths(); // Initialize paths before other threads start
 	// Run the game init and main loop
 	mainLoop(songlist);
 	return 0; // Do not remove. SDL_Main (which this function is called on some platforms) needs return statement.