Merge branch 'master' of /home/carl/git/dvdomatic

[dcpomatic.git] / src / wx / job_manager_view.cc

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 8bede709f5f0bfd1df13ce36c02b46cbff40d2ea..7361f29a815896d1021a5a1ed06a1500cc293f8c 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -98,17 +98,18 @@ JobManagerView::update ()
                if (!(*i)->finished ()) {
                        float const p = (*i)->overall_progress ();
                        if (p >= 0) {
-                               _job_records[*i].message->SetLabel (std_to_wx (st));
+                               checked_set (_job_records[*i].message, st);
                                _job_records[*i].gauge->SetValue (p * 100);
                        } else {
-                               _job_records[*i].message->SetLabel (_("Running"));
+                               checked_set (_job_records[*i].message, wx_to_std (_("Running")));
                                _job_records[*i].gauge->Pulse ();
                        }
                }
                
                if ((*i)->finished() && !_job_records[*i].finalised) {
                        _job_records[*i].gauge->SetValue (100);
-                       _job_records[*i].message->SetLabel (std_to_wx (st));
+                       checked_set (_job_records[*i].message, st);
+                       (*i)->Finished ();
                        _job_records[*i].finalised = true;
                        if (!(*i)->error_details().empty ()) {
                                _job_records[*i].details->Enable (true);