X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=b9a462801103957b8fbe1cee1e1c4a08ded73377;hb=1f029ed4422007ded20358683fa5b1cbf4d870da;hp=186e9c86b5b6fba09a9618ce9c7fe4ff6f2dcc38;hpb=83afdbcfe5d36a64d945843396ddadd22ea4691b;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 186e9c86b..b9a462801 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -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) {