Fix crash on changing audio gain in some locales.

Reported-by: Daniel Chauvet

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 751b453ed248f41862b42a40b16d942d49cfdd5e..63de451208f650813b0507d32d9b09289e68f62f 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -155,6 +155,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Mike Blakesley"));
        tested_by.Add (wxT ("David Booty"));
        tested_by.Add (wxT ("Roop Chand"));
+       tested_by.Add (wxT ("Daniel Chauvet"));
        tested_by.Add (wxT ("Adam Colt"));
        tested_by.Add (wxT ("John Convertino"));
        tested_by.Add (wxT ("Andreas Eli"));

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index d59c4ae07fdd2a37c9c5ab9d1b9bfc268c702c54..6c1508aeebae25b197b4273ace9aec1b7c48395e 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -21,6 +21,7 @@
 #include <wx/renderer.h>
 #include <wx/grid.h>
 #include <libdcp/types.h>
+#include <libdcp/raw_convert.h>
 #include "lib/audio_mapping.h"
 #include "lib/util.h"
 #include "audio_mapping_view.h"
@@ -238,7 +239,7 @@ AudioMappingView::update_cells ()
                _grid->SetCellValue (i, 0, wxString::Format (wxT("%d"), i + 1));
 
                for (int j = 1; j < _grid->GetNumberCols(); ++j) {
-                       _grid->SetCellValue (i, j, std_to_wx (lexical_cast<string> (_map.get (i, static_cast<libdcp::Channel> (j - 1)))));
+                       _grid->SetCellValue (i, j, std_to_wx (libdcp::raw_convert<string> (_map.get (i, static_cast<libdcp::Channel> (j - 1)))));
                }
        }