[Performous-commit] Lasse Karkkainen : Fix michelp and pdevhelp commandline options.

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

Module: performous
Branch: master
Commit: f222f8d2e0516b7a529d987a12f49fbef0960c4d

Author: Lasse Karkkainen <tro...@tr...>
Date:   Mon Jul  6 06:10:57 2009 +0300

Fix michelp and pdevhelp commandline options.

---

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

diff --git a/game/main.cc b/game/main.cc
index c6957e4..4b935b4 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -221,10 +221,16 @@ int main(int argc, char** argv) {
 		return 1;
 	}
 	po::notify(vm);
+	if (vm.count("version")) {
+		std::cout << PACKAGE << ' ' << VERSION << std::endl;
+		return 0;
+	}
 	if (vm.count("help")) {
 		std::cout << cmdline << std::endl;
 		return 0;
 	}
+	// Initialize audio for pdevhelp, michelp and the rest of the program
+	da::initialize libda;
 	if (vm.count("pdevhelp")) {
 		da::playback::devlist_t l = da::playback::devices();
 		std::cout << "Specify with --pdev [OPTIONS@]dev[:settings]]. For example:\n"
@@ -255,12 +261,6 @@ int main(int argc, char** argv) {
 		}
 		return 0;
 	}
-	if (vm.count("version")) {
-		std::cout << PACKAGE << ' ' << VERSION << std::endl;
-		return 0;
-	}
-	// Initialize audio
-	da::initialize libda;
 	// Read config files
 	try {
 		readConfig();