summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-03 20:02:17 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-03 20:02:17 +0000
commite55c3a8bdc86e64818ef26224c472dde54a16740 (patch)
tree6d47e01011f31f82cf85e5e200d9dc90e0eae1da
parentff3b5ecdb118639f93ec39e3c69a947b616fb40d (diff)
Try to fix crash on startup in some cases.
-rw-r--r--src/tools/dcpomatic_server.cc4
1 files changed, 3 insertions, 1 deletions
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 ();