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

File reverted-55253-plus-status.patch, 1.5 KB (added by beaglejoe, 3 months ago)
  • src/servers/app/Screen.cpp

    diff --git a/src/servers/app/Screen.cpp b/src/servers/app/Screen.cpp
    index 7672c03849..c37096bbbb 100644
    a b Screen::~Screen()  
    6767status_t
    6868Screen::Initialize()
    6969{
    70     status_t status = B_NO_INIT;
    71 
    7270    if (fHWInterface.IsSet()) {
    7371        // init the graphics hardware
    74         status = fHWInterface->Initialize();
     72        return fHWInterface->Initialize();
    7573    }
    7674
    77     // Turn on screen if this is not yet done by BIOS
    78     if (status == B_OK)
    79         fHWInterface->SetDPMSMode(B_DPMS_ON);
    80 
    81 
    82     return status;
     75    return B_NO_INIT;
    8376}
    8477
    8578
  • src/servers/app/VirtualScreen.cpp

    diff --git a/src/servers/app/VirtualScreen.cpp b/src/servers/app/VirtualScreen.cpp
    index 94a9e1e1f2..14cf7f8d6b 100644
    a b VirtualScreen::AddScreen(Screen* screen, ScreenConfigurations& configurations)  
    125125        status = screen->SetMode(mode);
    126126    }
    127127    if (status != B_OK) {
    128         status_t status = screen->SetPreferredMode();
     128        status = screen->SetPreferredMode();
    129129        if (status != B_OK)
    130130            status = screen->SetBestMode(1024, 768, B_RGB32, 60.f);
    131131        if (status != B_OK)
    VirtualScreen::AddScreen(Screen* screen, ScreenConfigurations& configurations)  
    136136        }
    137137    }
    138138
     139    // Turn on screen if this is not yet done by BIOS
     140    if (status == B_OK)
     141        screen->HWInterface()->SetDPMSMode(B_DPMS_ON);
     142
    139143    // TODO: this works only for single screen configurations
    140144    fDrawingEngine = screen->GetDrawingEngine();
    141145    fHWInterface = screen->HWInterface();