Fix 3D crash.

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

diff --git a/src/wx/name_format_editor.cc b/src/wx/name_format_editor.cc
index 160a554c01d3289216f057a27b0dfd7e51c9f1c0..82adc3f55d36cadc11caf2ba1153bcf1bea8d7cc 100644 (file)
--- a/src/wx/name_format_editor.cc
+++ b/src/wx/name_format_editor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,6 +20,7 @@
 
 #include "name_format_editor.h"
 #include "wx_util.h"
+#include "lib/util.h"
 
 using std::string;
 
@@ -33,7 +34,9 @@ NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp:
        , _suffix (suffix)
 {
        _sizer->Add (_specification, 0, wxEXPAND, DCPOMATIC_SIZER_Y_GAP);
-       _sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+       if (!_examples.empty ()) {
+               _sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+       }
        _panel->SetSizer (_sizer);
 
        for (dcp::NameFormat::Map::const_iterator i = titles.begin(); i != titles.end(); ++i) {
@@ -47,7 +50,7 @@ NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp:
        }
 
        _specification->SetValue (std_to_wx (_name.specification ()));
-       _specification->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&NameFormatEditor::changed, this));
+       _specification->Bind (wxEVT_TEXT, boost::bind (&NameFormatEditor::changed, this));
 
        update_example ();
 }
@@ -62,9 +65,13 @@ NameFormatEditor::changed ()
 void
 NameFormatEditor::update_example ()
 {
-       _name.set_specification (wx_to_std (_specification->GetValue ()));
+       if (_examples.empty ()) {
+               return;
+       }
+
+       _name.set_specification (careful_string_filter (wx_to_std (_specification->GetValue ())));
 
-       wxString example = wxString::Format (_("e.g. %s"), _name.get (_examples, _suffix));
+       wxString example = wxString::Format (_("e.g. %s"), std_to_wx (_name.get (_examples, _suffix)));
        wxString wrapped;
        for (size_t i = 0; i < example.Length(); ++i) {
                if (i > 0 && (i % 40) == 0) {