projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop some EnsureVisible() calls happening with out-of-range parameters.
[dcpomatic.git]
/
src
/
wx
/
language_tag_dialog.cc
diff --git
a/src/wx/language_tag_dialog.cc
b/src/wx/language_tag_dialog.cc
index c72c64b313c07f0465553d297a5ac0973fe0d816..ca08996c681d01a5d2c47b24ecbfd9000948316b 100644
(file)
--- 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 ();
_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);
}
} 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->SetItemState (selection, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
- _list->EnsureVisible (selection);
+ if (static_cast<int>(selection) < _list->GetItemCount()) {
+ _list->EnsureVisible (selection);
+ }
}
}