diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-15 23:52:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-15 23:52:41 +0100 |
| commit | 19d813fa48ef6f808109969696321f9c902ee63b (patch) | |
| tree | 609edc167c0aa8d06bf3caa78dac08c57b542db8 /src | |
| parent | 51f1885e63193b8ab62a51089298c3711269d2a3 (diff) | |
Fix crash on changing audio gain in some locales.
Reported-by: Daniel Chauvet
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/about_dialog.cc | 1 | ||||
| -rw-r--r-- | src/wx/audio_mapping_view.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 751b453ed..63de45120 100644 --- 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 d59c4ae07..6c1508aee 100644 --- 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))))); } } |