projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bad call to GetClientObject with no selection.
[dcpomatic.git]
/
src
/
wx
/
wx_util.cc
diff --git
a/src/wx/wx_util.cc
b/src/wx/wx_util.cc
index 186e9c86b5b6fba09a9618ce9c7fe4ff6f2dcc38..b9a462801103957b8fbe1cee1e1c4a08ded73377 100644
(file)
--- 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)
{
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) {
if (!o || string_client_data(o) != value) {
for (unsigned int i = 0; i < widget->GetCount(); ++i) {