1.1 --- a/src/main.c	Tue Nov 20 10:27:58 2007 +0000
     1.2 +++ b/src/main.c	Thu Nov 29 09:28:28 2007 +0000
     1.3 @@ -57,6 +57,7 @@
     1.4      gboolean display_ok;
     1.5  
     1.6      install_crash_handler();
     1.7 +    gdrom_get_native_devices();
     1.8  #ifdef ENABLE_NLS
     1.9      bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR);
    1.10      textdomain (PACKAGE);
    1.11 @@ -185,11 +186,15 @@
    1.12      sh4_set_use_xlat( use_xlat );
    1.13  
    1.14      if( start_immediately ) {
    1.15 -	if( time_nanos != 0 || time_secs != 0 ) {
    1.16 -	    dreamcast_run_for(time_secs, time_nanos);
    1.17 -	    return 0;
    1.18 +        if( dreamcast_can_run() ) {
    1.19 +	    if( time_nanos != 0 || time_secs != 0 ) {
    1.20 +	        dreamcast_run_for(time_secs, time_nanos);
    1.21 +		return 0;
    1.22 +	    } else {
    1.23 +	        dreamcast_run();
    1.24 +	    }
    1.25  	} else {
    1.26 -	    dreamcast_run();
    1.27 +	    ERROR( "Unable to start dreamcast: no program/bios loaded" );
    1.28  	}
    1.29      }
    1.30      if( !headless ) {