X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Flanguage_tag_dialog.cc;fp=src%2Fwx%2Flanguage_tag_dialog.cc;h=ca08996c681d01a5d2c47b24ecbfd9000948316b;hb=bb9a4a46266f705142a8aca41a092445a02debf0;hp=c72c64b313c07f0465553d297a5ac0973fe0d816;hpb=f188fc8d92eaba89aaa63cfd7f5a2fc9836e94b6;p=dcpomatic.git

diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index c72c64b31..ca08996c6 100644
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -116,7 +116,9 @@ LanguageTagDialog::set (dcp::LanguageTag tag)
 			_custom.push_back (tag);
 			selection = _presets.size() + _custom.size() - 1;
 			populate_list ();
-			_list->EnsureVisible (_list->GetItemCount() - 1);
+			if (_list->GetItemCount() > 0) {
+				_list->EnsureVisible (_list->GetItemCount() - 1);
+			}
 		} else {
 			selection = _presets.size() + std::distance(_custom.begin(), iter);
 		}
@@ -125,7 +127,9 @@ LanguageTagDialog::set (dcp::LanguageTag tag)
 	}
 
 	_list->SetItemState (selection, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-	_list->EnsureVisible (selection);
+	if (static_cast<int>(selection) < _list->GetItemCount()) {
+		_list->EnsureVisible (selection);
+	}
 }