Do EncodeServerFinder 'disable' in a more sensible way.

[dcpomatic.git] / src / tools / dcpomatic_cli.cc

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index eaf868fcaecd548ef9a0e75356ff8d85dfdc6bf9..096a3b11895ac20784fc226d78b87c984237bab8 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -256,7 +256,7 @@ main (int argc, char* argv[])
        signal_manager = new SignalManager ();
 
        if (no_remote) {
-               EncodeServerFinder::instance()->disable ();
+               EncodeServerFinder::instance()->stop ();
        }
 
        if (json_port) {
@@ -317,7 +317,11 @@ main (int argc, char* argv[])
 
                BOOST_FOREACH (shared_ptr<Job> i, jobs) {
                        if (progress) {
-                               cout << i->name() << "; " << i->sub_name() << ": ";
+                               cout << i->name();
+                               if (!i->sub_name().empty()) {
+                                       cout << "; " << i->sub_name();
+                               }
+                               cout << ": ";
 
                                if (i->progress ()) {
                                        cout << i->status() << "                            \n";