From 0b7e12200a106406aabaa9570c75f339732b7a8a Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 19 Jul 2019 08:58:49 +0200 Subject: [PATCH] gui restable: contents were not reset when search was --- src/qtgui/restable.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp index ac999512..22dc3ed8 100644 --- a/src/qtgui/restable.cpp +++ b/src/qtgui/restable.cpp @@ -290,15 +290,11 @@ void RecollModel::readDocSource() void RecollModel::setDocSource(std::shared_ptr nsource) { LOGDEB("RecollModel::setDocSource\n"); - if (!nsource) { - m_source = std::shared_ptr(); + m_source = nsource; + if (m_source) { + m_source->getTerms(m_hdata); } else { - // We used to allocate a new DocSource here instead of sharing - // the input, but I can't see why. - //m_source = std::shared_ptr(new - //DocSource(theconfig,nsource)); - m_source = nsource; - m_hdata.clear(); + m_hdata.clear(); } } @@ -705,6 +701,7 @@ void ResTable::resetSource() { LOGDEB("ResTable::resetSource\n"); setDocSource(std::shared_ptr()); + readDocSource(); } void ResTable::saveAsCSV() @@ -773,7 +770,6 @@ void ResTable::readDocSource(bool resetPos) if (resetPos) tableView->verticalScrollBar()->setSliderPosition(0); - m_model->m_source->getTerms(m_model->m_hdata); m_model->readDocSource(); m_detail->clear(); m_detaildocnum = -1;