Merge branch 'master' into pdo

1 files changed, 1 insertions, 1 deletions

diff --git a/update.php b/update.php
index e13abafca..be7314175 100755
--- a/update.php
+++ b/update.php
@@ -128,7 +128,7 @@
 	$lock_handle = make_lockfile($lock_filename);
 	$must_exit = false;
 
-	if (isset($options["task"])) {
+	if (isset($options["task"]) && isset($options["pidlock"])) {
 		$waits = $options["task"] * 5;
 		_debug("Waiting before update ($waits)");
 		sleep($waits);