1.1 --- a/src/main.c	Tue Jan 01 08:37:26 2008 +0000
     1.2 +++ b/src/main.c	Mon Jan 14 09:04:03 2008 +0000
     1.3 @@ -34,7 +34,7 @@
     1.4  
     1.5  #define S3M_PLAYER "s3mplay.bin"
     1.6  
     1.7 -char *option_list = "a:m:s:A:V:v:puhbd:c:t:T:xD";
     1.8 +char *option_list = "a:m:s:A:V:v:puhbd:c:t:T:xDn";
     1.9  struct option longopts[1] = { { NULL, 0, 0, 0 } };
    1.10  char *aica_program = NULL;
    1.11  char *s3m_file = NULL;
    1.12 @@ -43,6 +43,7 @@
    1.13  char *audio_driver_name = NULL;
    1.14  char *trace_regions = NULL;
    1.15  gboolean start_immediately = FALSE;
    1.16 +gboolean no_start = FALSE;
    1.17  gboolean headless = FALSE;
    1.18  gboolean without_bios = FALSE;
    1.19  gboolean use_xlat = TRUE;
    1.20 @@ -83,6 +84,10 @@
    1.21  	    t = strtod(optarg, NULL);
    1.22  	    sh4_cpu_multiplier = (int)(1000.0/t);
    1.23  	    break;
    1.24 +	case 'n': /* Don't start immediately */
    1.25 +	    no_start = TRUE;
    1.26 +	    start_immediately = FALSE;
    1.27 +	    break;
    1.28  	case 's': /* AICA-only w/ S3M player */
    1.29  	    aica_program = S3M_PLAYER;
    1.30  	    s3m_file = optarg;
    1.31 @@ -95,6 +100,7 @@
    1.32  	    break;
    1.33  	case 'p': /* Start immediately */
    1.34  	    start_immediately = TRUE;
    1.35 +	    no_start = FALSE;
    1.36      	    break;
    1.37  	case 'u': /* Allow unsafe dcload syscalls */
    1.38  	    dcload_set_allow_unsafe(TRUE);
    1.39 @@ -179,7 +185,9 @@
    1.40  	if( !ok ) {
    1.41  	    ERROR( "Unrecognized file '%s'", argv[optind] );
    1.42  	}
    1.43 -	start_immediately = ok;
    1.44 +	if( !no_start ) {
    1.45 +	    start_immediately = ok;
    1.46 +	}
    1.47      }
    1.48  
    1.49      if( disc_file != NULL ) {