Browse Source

Fixed deadlock when inserting snippets when using autocomplete keys

merge-requests/413/head
eidheim 4 years ago
parent
commit
3b0412e870
  1. 16
      src/source_generic.cpp

16
src/source_generic.cpp

@ -234,15 +234,17 @@ void Source::GenericView::setup_autocomplete() {
} }
} }
} }
LockGuard lock(snippets_mutex); if(snippets_mutex.try_lock()) { // To avoid deadlock when inserting snippets
if(snippets) { if(snippets) {
for(auto &snippet : *snippets) { for(auto &snippet : *snippets) {
if(starts_with(snippet.prefix, prefix)) { if(starts_with(snippet.prefix, prefix)) {
autocomplete.rows.emplace_back(snippet.prefix); autocomplete.rows.emplace_back(snippet.prefix);
autocomplete_insert.emplace_back(snippet.body); autocomplete_insert.emplace_back(snippet.body);
autocomplete_comment.emplace_back(snippet.description); autocomplete_comment.emplace_back(snippet.description);
}
} }
} }
snippets_mutex.unlock();
} }
} }
return true; return true;

Loading…
Cancel
Save