recoll gui indexing: make execmd thread-safe. This plus the previous change about accessing the global config should fix the crashes observed when changing the configuration throgh the gui while the indexing thread is running

This commit is contained in:
Jean-Francois Dockes
2011-03-02 16:20:25 +01:00
parent e1a20aa810
commit 69b491feb3
5 changed files with 33 additions and 12 deletions
+2 -5
View File
@@ -67,13 +67,11 @@ void ConfIndexW::acceptChanges()
QMessageBox::critical(0, "Recoll",
tr("Can't write configuration file"));
}
// Delete local copy
// Delete local copy and update the main one from the file
delete m_conf;
m_conf = 0;
// Update in-memory config
m_rclconf->updateMainConfig();
QTimer::singleShot(0, this, SLOT(reloadPanels()));
if (startIndexingAfterConfig) {
startIndexingAfterConfig = 0;
start_indexing(true);
@@ -84,10 +82,9 @@ void ConfIndexW::acceptChanges()
void ConfIndexW::rejectChanges()
{
LOGDEB(("ConfIndexW::rejectChanges()\n"));
// Discard local changes, and make new copy
// Discard local changes.
delete m_conf;
m_conf = 0;
QTimer::singleShot(0, this, SLOT(reloadPanels()));
hide();
}