From 06960c6241f6209b6dd19b4c204c27f1395cda7d Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Fri, 15 Aug 2014 22:47:35 +0000
Subject: Fix crash when there's no background task to execute.

---
 bin/bbackupd/BackupDaemon.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp
index 577b1861..91bb29ba 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/bin/bbackupd/BackupDaemon.cpp
@@ -1884,7 +1884,12 @@ bool BackupDaemon::RunBackgroundTask(State state, uint64_t progress,
 {
 	BOX_TRACE("BackupDaemon::RunBackgroundTask: state = " << state <<
 		", progress = " << progress << "/" << maximum);
-	
+
+	if(!mapCommandSocketPollTimer.get())
+	{
+		return true; // no background task
+	}
+
 	if(mapCommandSocketPollTimer->HasExpired())
 	{
 		mapCommandSocketPollTimer->Reset(COMMAND_SOCKET_POLL_INTERVAL);
-- 
cgit v1.2.3