From 91de05130520dce5d8d09447552152da06ec2c97 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Thu, 26 Sep 2013 18:49:50 -0400
Subject: [PATCH] ScreenSaver: Revert the controversial parts of hrev46012

ScreenSaver once again locks up due to the bug described in #4260
awaiting a systemic fix.
---
 src/kits/screensaver/ScreenSaverRunner.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/kits/screensaver/ScreenSaverRunner.cpp b/src/kits/screensaver/ScreenSaverRunner.cpp
index 0a0e170998..7c4a9aeaad 100644
--- a/src/kits/screensaver/ScreenSaverRunner.cpp
+++ b/src/kits/screensaver/ScreenSaverRunner.cpp
@@ -182,16 +182,14 @@ ScreenSaverRunner::_Run()
 {
 	static const uint32 kInitialTickRate = 50000;
 
-	status_t lockStatus = fWindow->LockWithTimeout(kInitialTickRate);
-	if (lockStatus == B_OK) {
+	if (fWindow->Lock()) {
 		fView->SetViewColor(0, 0, 0);
 		fView->SetLowColor(0, 0, 0);
 		if (fSaver != NULL)
 			fHasStarted = fSaver->StartSaver(fView, fPreview) == B_OK;
 
 		fWindow->Unlock();
-	} else
-		return lockStatus;
+	}
 
 	// TODO: This code is getting awfully complicated and should
 	// probably be refactored.