From e55c3a8bdc86e64818ef26224c472dde54a16740 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 3 Dec 2015 20:02:17 +0000
Subject: Try to fix crash on startup in some cases.

---
 src/tools/dcpomatic_server.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index b45e57941..cc783ede7 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -130,7 +130,7 @@ private:
 	float _fps;
 };
 
-static shared_ptr<ServerLog> server_log (new ServerLog);
+static shared_ptr<ServerLog> server_log;
 
 class StatusDialog : public wxDialog
 {
@@ -263,6 +263,8 @@ private:
 			return false;
 		}
 
+		server_log.reset (new ServerLog);
+
 		dcpomatic_setup_path_encoding ();
 		dcpomatic_setup_i18n ();
 		dcpomatic_setup ();
-- 
cgit v1.2.3