X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Flanguage_tag_dialog.cc;h=91ac3512dfa96a1fb0d993d89e6cf53389a10a27;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=96e7c528390b170a09a760cdad322249e4dbe554;hpb=d461d2685050842cb86875f5a5aa62505779b9ed;p=dcpomatic.git

diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index 96e7c5283..91ac3512d 100644
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -23,8 +23,11 @@
 #include "language_tag_dialog.h"
 #include "wx_util.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/language_tag.h>
 
 
@@ -116,7 +119,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,6 +130,9 @@ LanguageTagDialog::set (dcp::LanguageTag tag)
 	}
 
 	_list->SetItemState (selection, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+	if (static_cast<int>(selection) < _list->GetItemCount()) {
+		_list->EnsureVisible (selection);
+	}
 }