Create SignalManager in the front end, not the tested part.

Otherwise the wrong SignalManager gets used for some tests (after an
encode_cli test) which causes problems.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/encode_cli.cc b/src/lib/encode_cli.cc
index 6260e9dd9..a682fa4e3 100644
--- a/src/lib/encode_cli.cc
+++ b/src/lib/encode_cli.cc
@@ -37,7 +37,6 @@
 #include "log.h"
 #include "make_dcp.h"
 #include "ratio.h"
-#include "signal_manager.h"
 #include "transcode_job.h"
 #include "util.h"
 #include "variant.h"
@@ -401,8 +400,6 @@ encode_cli(int argc, char* argv[], function<void (string)> out, function<void ()
 
 	film_dir = argv[optind];
 
-	signal_manager = new SignalManager();
-
 	if (no_remote || export_format) {
 		EncodeServerFinder::drop();
 	}
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 178cd9123..27934e664 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -26,6 +26,7 @@
 
 #include "lib/cross.h"
 #include "lib/encode_cli.h"
+#include "lib/signal_manager.h"
 #include "lib/util.h"
 #include <iostream>
 
@@ -38,6 +39,8 @@ main(int argc, char* argv[])
 	dcpomatic_setup_path_encoding();
 	dcpomatic_setup();
 
+	signal_manager = new SignalManager();
+
 	auto error = encode_cli(fixer.argc(), fixer.argv(), [](std::string s) { std::cout << s; }, []() { std::cout.flush(); });
 	if (error) {
 		std::cerr << *error << "\n";