diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
| commit | bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6 (patch) | |
| tree | 6bdc6fa07f2cde0565c4025ab552f2c0fc9c3b2f /src/tools | |
| parent | 6a0da4eb43fc684c0f54a7a3a817a31dc8db7109 (diff) | |
| parent | 27867be66579551018c926ed3339624e463c1b08 (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_server_cli.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 0b946181a..44abf4116 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -216,6 +216,8 @@ main (int argc, char* argv[]) indirectly holding onto codecs. */ JobManager::drop (); + + ServerFinder::drop (); return error ? EXIT_FAILURE : EXIT_SUCCESS; } diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index b816460a3..80f4a0d0c 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -112,7 +112,7 @@ main (int argc, char* argv[]) try { server.run (num_threads); - } catch (boost::system::system_error e) { + } catch (boost::system::system_error& e) { if (e.code() == boost::system::errc::address_in_use) { cerr << argv[0] << ": address already in use. Is another DCP-o-matic server instance already running?\n"; exit (EXIT_FAILURE); |