Chameleon Commit Details - 351 - Chameleon open source boot loader project.

Date:

2010-08-11 02:20:58 (13 years 8 months ago)

Author:

Tamás Kosárszky

Commit:

351

Parents:

350

Message:

Disabling GUI if initGUI() returns with an error.

Changes:

M	/trunk/i386/boot2/boot.c

File differences

-320
321 321
322 322
323 
324 
325 
326 
327 
328 
329 
323
324
325
326
327
328
329
330
330 331
331 332
332 333
+    getc();␊
#endif␊
␊
    useGUI = true;␊
    // Override useGUI default␊
    getBoolForKey(kGUIKey, &useGUI, &bootInfo->bootConfig);␊
    if (useGUI) {␊
        /* XXX AsereBLN handle error */␊
␉initGUI();␊
    }␊
␉useGUI = true;␊
␉// Override useGUI default␊
␉getBoolForKey(kGUIKey, &useGUI, &bootInfo->bootConfig);␊
␉if (useGUI && initGUI())␊
␉{␊
␉␉// initGUI() returned with an error, disabling GUI.␊
␉␉useGUI = false;␊
␉}␊
␊
    setBootGlobals(bvChain);␊
␊
     getc();␊
 #endif␊
 ␊
-    useGUI = true;␊
-    // Override useGUI default␊
-    getBoolForKey(kGUIKey, &useGUI, &bootInfo->bootConfig);␊
-    if (useGUI) {␊
-        /* XXX AsereBLN handle error */␊
-␉initGUI();␊
-    }␊
+␉useGUI = true;␊
+␉// Override useGUI default␊
+␉getBoolForKey(kGUIKey, &useGUI, &bootInfo->bootConfig);␊
+␉if (useGUI && initGUI())␊
+␉{␊
+␉␉// initGUI() returned with an error, disabling GUI.␊
+␉␉useGUI = false;␊
+␉}␊
 ␊
     setBootGlobals(bvChain);␊
 ␊