Permalink
Browse files

Merge branch 'master' of http://github.com/etexteditor/e

  • Loading branch information...
2 parents 9cf959d + adaf9c7 commit 1f949f2de72752d9a47f04826b7b80b66f77c3b2 @tea committed Jan 13, 2011
Showing with 6 additions and 4 deletions.
  1. +6 −4 src/Accelerators.cpp
View
10 src/Accelerators.cpp
@@ -279,10 +279,12 @@ void Accelerators::ReadCustomShortcuts() {
wxJSONValue bindings = jsonRoot[wxT("bindings")];
m_customBindings.clear();
- wxArrayString keys = bindings.GetMemberNames();
- for(unsigned int c = 0; c < keys.size(); c++) {
- wxString key = keys[c];
- m_customBindings[normalize(key)] = bindings[key].AsString();
+ if (bindings.IsObject()) {
+ const wxArrayString keys = bindings.GetMemberNames();
+ for(unsigned int c = 0; c < keys.size(); c++) {
+ const wxString key = keys[c];
+ m_customBindings[normalize(key)] = bindings[key].AsString();
+ }
}
}

0 comments on commit 1f949f2

Please sign in to comment.