Try to fix mangled wx/std string conversions.

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 66f366a24148d7ea1ee1f07966ed73b04b172389..2ad41b2cb8d08bd6cde0736dfc8282f5fca2dc08 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -328,7 +328,7 @@ private:
                        } catch (std::exception& e) {
                                wxString p = c->GetPath ();
                                wxCharBuffer b = p.ToUTF8 ();
-                               error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), e.what()));
+                               error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what())));
                        }
                }
 

diff --git a/src/wx/job_wrapper.cc b/src/wx/job_wrapper.cc
index 8ddd3a3484cab9aad1492555beba1f4ed55d0728..ede11762ccc7329018b0b5408129b07ab4795e18 100644 (file)
--- a/src/wx/job_wrapper.cc
+++ b/src/wx/job_wrapper.cc
@@ -35,8 +35,8 @@ JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film)
        try {
                film->make_dcp ();
        } catch (BadSettingError& e) {
-               error_dialog (parent, wxString::Format (_("Bad setting for %s (%s)"), e.setting().c_str(), e.what()));
+               error_dialog (parent, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx (e.setting().c_str()), std_to_wx (e.what())));
        } catch (std::exception& e) {
-               error_dialog (parent, wxString::Format (_("Could not make DCP: %s"), e.what ()));
+               error_dialog (parent, wxString::Format (_("Could not make DCP: %s"), std_to_wx (e.what ())));
        }
 }