Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index b6285c835bc47ffa9f19f24a71e2ecd8aacb7cc4..36aabf7766014b4cc12541914cb05179e8d71246 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -70,7 +70,7 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
        vector<string> columns;
        columns.push_back (wx_to_std (_("Address")));
        _email_list = new EditableList<string, EmailDialog> (
-               this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&string_not_empty, _1), bind (&column, _1)
+               this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&column, _1)
                );
 
        sizer->Add (_email_list, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND);
@@ -102,10 +102,12 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
        _offsets.push_back (Offset (_("UTC+3"),     3,  0));
        _offsets.push_back (Offset (_("UTC+4"),     4,  0));
        _offsets.push_back (Offset (_("UTC+5"),     5,  0));
+       _offsets.push_back (Offset (_("UTC+5:30"),  5, 30));
        _offsets.push_back (Offset (_("UTC+6"),     6,  0));
        _offsets.push_back (Offset (_("UTC+7"),     7,  0));
        _offsets.push_back (Offset (_("UTC+8"),     8,  0));
        _offsets.push_back (Offset (_("UTC+9"),     9,  0));
+       _offsets.push_back (Offset (_("UTC+9:30"),  9, 30));
        _offsets.push_back (Offset (_("UTC+10"),   10,  0));
        _offsets.push_back (Offset (_("UTC+11"),   11,  0));
        _offsets.push_back (Offset (_("UTC+12"),   12,  0));