From c415a9374872c6235fe822a5e038546522817e3a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 21 Mar 2017 12:18:47 +0100
Subject: Fix a couple of warnings and notices from error.log

---
 modules-available/serversetup-bwlp/page.inc.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'modules-available/serversetup-bwlp/page.inc.php')

diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php
index 9bea4b50..9d7d11ac 100644
--- a/modules-available/serversetup-bwlp/page.inc.php
+++ b/modules-available/serversetup-bwlp/page.inc.php
@@ -81,8 +81,13 @@ class Page_ServerSetup extends Page
 			return false;
 		}
 
-		if ($this->taskStatus['statusCode'] === TASK_WAITING) { // TODO: Async if just displaying
-			$this->taskStatus = Taskmanager::waitComplete($this->taskStatus['id']);
+		if (!Taskmanager::isFinished($this->taskStatus)) { // TODO: Async if just displaying
+			$this->taskStatus = Taskmanager::waitComplete($this->taskStatus['id'], 4000);
+		}
+
+		if (Taskmanager::isFailed($this->taskStatus) || !isset($this->taskStatus['data']['addresses'])) {
+			$this->taskStatus['data']['addresses'] = false;
+			return false;
 		}
 
 		$sortIp = array();
-- 
cgit v1.2.3-55-g7522