Ticket #7352: loadermain-nogoto.patch

src/system/boot/loader/main.cpp

@@ -1 +1 @@
 /*
  * Copyright 2003-2005, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2011, Daniel Kasza, daniel@kasza.hu.
  * Distributed under the terms of the MIT License.
  */
 
@@ -75 +76 @@
 
         if (user_menu(&volume) < B_OK) {
             // user requested to quit the loader
-            goto out;
+            volume = NULL;
         }
     }
 
@@ -97 +98 @@
 
             if (user_menu(&volume) < B_OK || volume == NULL) {
                 // user requested to quit the loader
-                goto out;
+                status = B_ERROR;
+                break;
             }
         }
 
@@ -139 +141 @@
         }
     }
 
-out:
     heap_release(args);
     return 0;
 }