tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUI: Fix a couple cases where a null lineedit completer could cause a crash

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-11-28 18:22:03 +01:00
parent f42338c026
commit f5418aa263
1 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qtgui/ssearch_w.cpp
View File

@ -216,7 +216,7 @@ void SSearch::onCompleterShown()
LOGDEB0("SSearch::onCompleterShown: no completer\n"); LOGDEB0("SSearch::onCompleterShown: no completer\n");
return; return;
} }
QAbstractItemView *popup = queryText->completer()->popup(); QAbstractItemView *popup = completer->popup();
if (!popup) { if (!popup) {
LOGDEB0("SSearch::onCompleterShown: no popup\n"); LOGDEB0("SSearch::onCompleterShown: no popup\n");
return; return;
@ -321,6 +321,7 @@ void SSearch::onCompletionActivated(const QString& text)
void SSearch::onHistoryClicked() void SSearch::onHistoryClicked()
{ {
if (m_completermodel) { if (m_completermodel) {
queryText->setCompleter(m_completer);
m_completermodel->onPartialWord(SST_LANG, "", ""); m_completermodel->onPartialWord(SST_LANG, "", "");
queryText->completer()->complete(); queryText->completer()->complete();
} }
@ -423,7 +424,7 @@ tr("</table></body></html>")
void SSearch::startSimpleSearch() void SSearch::startSimpleSearch()
{ {
if (queryText->completer()->popup()->isVisible()) { if (queryText->completer() && queryText->completer()->popup()->isVisible()) {
return; return;
} }
string u8 = qs2u8s(queryText->text()); string u8 = qs2u8s(queryText->text());