diff options
Diffstat (limited to 'src/frontend/keychooser/clexiconkeychooser.cpp')
| -rw-r--r-- | src/frontend/keychooser/clexiconkeychooser.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/frontend/keychooser/clexiconkeychooser.cpp b/src/frontend/keychooser/clexiconkeychooser.cpp index 45fa0e2..eca19d4 100644 --- a/src/frontend/keychooser/clexiconkeychooser.cpp +++ b/src/frontend/keychooser/clexiconkeychooser.cpp @@ -117,8 +117,11 @@ void CLexiconKeyChooser::refreshContent() { QStringList refEntries = *(it->second); //copy the items for the first time QStringList* cmpEntries = ( ++it )->second; //list for comparision, starts with the second module in the map - while (it != entryMap.end()) { - std::set_intersection( + // Testing for refEntries being empty is not needed for the set union + // of all keys, but is a good idea since it is being updated in the + // loop. It is necessary for set intersection and prevents a crash. + while (it != entryMap.end() && (refEntries.begin() != refEntries.end())) { + std::set_union( refEntries.begin(), --(refEntries.end()), //--end() is the last valid entry cmpEntries->begin(), --(cmpEntries->end()), std::back_inserter(goodEntries), //append valid entries to the end of goodEntries |