ScreenSaver: Revert the controversial parts of hrev46012
ScreenSaver once again locks up due to the bug described in #4260 awaiting a systemic fix.
This commit is contained in:
@@ -182,16 +182,14 @@ ScreenSaverRunner::_Run()
|
|||||||
{
|
{
|
||||||
static const uint32 kInitialTickRate = 50000;
|
static const uint32 kInitialTickRate = 50000;
|
||||||
|
|
||||||
status_t lockStatus = fWindow->LockWithTimeout(kInitialTickRate);
|
if (fWindow->Lock()) {
|
||||||
if (lockStatus == B_OK) {
|
|
||||||
fView->SetViewColor(0, 0, 0);
|
fView->SetViewColor(0, 0, 0);
|
||||||
fView->SetLowColor(0, 0, 0);
|
fView->SetLowColor(0, 0, 0);
|
||||||
if (fSaver != NULL)
|
if (fSaver != NULL)
|
||||||
fHasStarted = fSaver->StartSaver(fView, fPreview) == B_OK;
|
fHasStarted = fSaver->StartSaver(fView, fPreview) == B_OK;
|
||||||
|
|
||||||
fWindow->Unlock();
|
fWindow->Unlock();
|
||||||
} else
|
}
|
||||||
return lockStatus;
|
|
||||||
|
|
||||||
// TODO: This code is getting awfully complicated and should
|
// TODO: This code is getting awfully complicated and should
|
||||||
// probably be refactored.
|
// probably be refactored.
|
||||||
|
|||||||
Reference in New Issue
Block a user