If no shell was requested via Ctrl-B, exit immediately if boot fails.

diff --git a/src/core/main.c b/src/core/main.c
index 88fbb57..3295fea 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -29,14 +29,11 @@ __cdecl int main ( void ) {
        initialise();
        startup();
 
-       /* Try autobooting if we're not going straight to the shell */
-       if ( ! shell_banner() ) {
+       if ( shell_banner() )
+               shell();
+       else
                autoboot();
-       }
        
-       /* Autobooting failed or the user wanted the shell */
-       shell();
-
        shutdown();
 
        return 0;