From: Carl Hetherington <cth@carlh.net>
Date: Thu, 24 Sep 2015 14:52:01 +0000 (+0100)
Subject: Fix possible null pointer dereference.
X-Git-Tag: v2.3.6~24
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=511f4bbb6dd088cc32163edfe5004761a33a8311;p=dcpomatic.git

Fix possible null pointer dereference.
---

diff --git a/src/lib/job.cc b/src/lib/job.cc
index c228defc5..439000e58 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -447,4 +447,3 @@ Job::when_finished (boost::signals2::connection& connection, function<void()> fi
 		connection = Finished.connect (finished);
 	}
 }
-
diff --git a/src/lib/server.cc b/src/lib/server.cc
index c1db1e6ac..260f2e469 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -89,7 +89,9 @@ Server::~Server ()
 	_io_service.stop ();
 
 	_broadcast.io_service.stop ();
-	_broadcast.thread->join ();
+	if (_broadcast.thread) {
+		_broadcast.thread->join ();
+	}
 }
 
 /** @param after_read Filled in with gettimeofday() after reading the input from the network.