From 52387f27b3afc4b2ac05c2c37c34875acba13c08 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Sun, 17 Jan 2016 14:01:36 -0500 Subject: [PATCH] Fixed double re-detection when the camera is not running and objects were updated --- src/MainWindow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 191ec1d0..8b77a700 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1607,7 +1607,10 @@ void MainWindow::notifyParametersChanged(const QStringList & paramChanged) this->statusBar()->showMessage(tr("A parameter has changed... \"Update objects\" may be required.")); } - if(parameterChanged && !camera_->isRunning() && !sceneImage_.empty()) + if(parameterChanged && + !camera_->isRunning() && + !sceneImage_.empty() && + !(Settings::getGeneral_autoUpdateObjects() && detectorDescriptorParamsChanged)) // already done in updateObjects() above { this->update(sceneImage_); ui_->label_timeRefreshRate->setVisible(false);