Merge master.

[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 47af3b48c9ab06274e835d35678388b2914e9ed1..df9c6f5f1d996dfcbccff08753d71b5789c007c6 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -44,11 +44,13 @@ public:
                , _window (window)
                , _panel (panel)
                , _table (table)
+               , _pause (0)
        {
                int n = 0;
                
                _name = new wxStaticText (panel, wxID_ANY, "");
-               _name->SetLabelMarkup ("<b>" + _job->name () + "</b>");
+               string const jn = "<b>" + _job->name () + "</b>";
+               _name->SetLabelMarkup (std_to_wx (jn));
                table->Insert (n, _name, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
                ++n;
        
@@ -133,6 +135,9 @@ private:
                }
                
                _cancel->Enable (false);
+               if (_pause) {
+                       _pause->Enable (false);
+               }
                if (!_job->error_details().empty ()) {
                        _details->Enable (true);
                }