Ticket #17163: reverted-55253-plus-status.patch

src/servers/app/Screen.cpp

@@ -67 +67 @@
 status_t
 Screen::Initialize()
 {
-    status_t status = B_NO_INIT;
-
     if (fHWInterface.IsSet()) {
         // init the graphics hardware
-        status = fHWInterface->Initialize();
+        return fHWInterface->Initialize();
     }
 
-    // Turn on screen if this is not yet done by BIOS
-    if (status == B_OK)
-        fHWInterface->SetDPMSMode(B_DPMS_ON);
-
-
-    return status;
+    return B_NO_INIT;
 }
 
 

src/servers/app/VirtualScreen.cpp

@@ -125 +125 @@
         status = screen->SetMode(mode);
     }
     if (status != B_OK) {
-        status_t status = screen->SetPreferredMode();
+        status = screen->SetPreferredMode();
         if (status != B_OK)
             status = screen->SetBestMode(1024, 768, B_RGB32, 60.f);
         if (status != B_OK)
@@ -136 +136 @@
         }
     }
 
+    // Turn on screen if this is not yet done by BIOS
+    if (status == B_OK)
+        screen->HWInterface()->SetDPMSMode(B_DPMS_ON);
+
     // TODO: this works only for single screen configurations
     fDrawingEngine = screen->GetDrawingEngine();
     fHWInterface = screen->HWInterface();