--- SIDPlayer/src/main_beos.cpp	2000/09/19 15:34:11	1.1
+++ SIDPlayer/src/main_beos.cpp	2001/01/21 18:04:46	1.4
@@ -1,7 +1,7 @@
 /*
  *  main_beos.cpp - SIDPlayer BeOS main program
  *
- *  SIDPlayer (C) Copyright 1996-2000 Christian Bauer
+ *  SIDPlayer (C) Copyright 1996-2001 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 
 #include "main.h"
 #include "prefs_window.h"
+#include "sid.h"
 
 
 // Message codes
@@ -186,9 +187,14 @@ SIDPlayer::~SIDPlayer()
 
 void SIDPlayer::ArgvReceived(int32 argc, char **argv)
 {
-	if (argc >= 2) {
+	if (argc < 2)
+		return;
+
+	for (int i=1; i<argc; i++) {
+		if (argv[i][0] == '-')
+			continue;
 		player.Stop();
-		LoadPSIDFile(argv[1]);
+		LoadPSIDFile(argv[i]);
 		player.Start();
 		player_stopped = false;
 		if (main_window)
@@ -292,7 +298,7 @@ void SIDPlayer::MessageReceived(BMessage
 void SIDPlayer::ReadyToRun(void)
 {
 	main_window = new MainWindow();
-	if (psid_loaded)
+	if (IsPSIDLoaded())
 		main_window->PostMessage(MSG_NEW_MODULE);
 }
 
@@ -304,8 +310,8 @@ void SIDPlayer::ReadyToRun(void)
 void AboutWindow(void)
 {
 	BAlert *theAlert = new BAlert("",
-			"SIDPlayer\nVersion 4.0\n\n"
-			"Copyright " B_UTF8_COPYRIGHT " 1996-2000 Christian Bauer\n"
+			"SIDPlayer\nVersion " VERSION "\n\n"
+			"Copyright " B_UTF8_COPYRIGHT " 1996-2001 Christian Bauer\n"
 			"E-mail: Christian.Bauer@uni-mainz.de\n"
 			"http://www.uni-mainz.de/~bauec002/\n\n"
 			"SIDPlayer comes with ABSOLUTELY NO\n"
@@ -641,7 +647,7 @@ void PrevButton::Draw(BRect update)
 
 int main(int argc, char **argv)
 {
-	InitAll();
+	InitAll(argc, argv);
 	SIDPlayer *the_app = new SIDPlayer();
 	the_app->Run();
 	delete the_app;