X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=bc444e4bc2a6370ed54d100cb51f864f17345229;hb=e9ee53e42d7f8bbcd2a454ee9de5f3e66ec06b03;hp=186e9c86b5b6fba09a9618ce9c7fe4ff6f2dcc38;hpb=288e7e64e9be84b8dbe11f5acb490e64a29d9378;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 186e9c86b..bc444e4bc 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -33,7 +33,7 @@ using namespace boost;
  *  @param s Sizer to add to.
  *  @param p Parent window for the wxStaticText.
  *  @param t Text for the wxStaticText.
- *  @param prop Properties to pass when calling Add() on the wxSizer.
+ *  @param prop Proportion to pass when calling Add() on the wxSizer.
  */
 wxStaticText *
 add_label_to_sizer (wxSizer* s, wxWindow* p, string t, int prop)
@@ -155,7 +155,10 @@ checked_set (wxComboBox* widget, int value)
 void
 checked_set (wxComboBox* widget, string value)
 {
-	wxClientData* o = widget->GetClientObject (widget->GetSelection ());
+	wxClientData* o = 0;
+	if (widget->GetSelection() != -1) {
+		o = widget->GetClientObject (widget->GetSelection ());
+	}
 	
 	if (!o || string_client_data(o) != value) {
 		for (unsigned int i = 0; i < widget->GetCount(); ++i) {