From 3bd58086d2fd1e89a3a907804c599012acc6688a Mon Sep 17 00:00:00 2001 From: matlabbe Date: Thu, 8 May 2014 19:02:42 +0000 Subject: [PATCH] When selecting an object from scene, don't start the camera when it is paused. (issue with a directory of image, which we don't want the camera running while selecting objects) git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@267 620bd6b2-0a58-f614-fd9a-1bd335dccda9 --- src/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 0d0eb776..3985af3b 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -416,7 +416,7 @@ void MainWindow::addObjectFromScene() disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &))); AddObjectDialog * dialog; bool resumeCamera = camera_->isRunning(); - if(!ui_->actionStart_camera->isEnabled() || ui_->imageView_source->cvImage().empty()) + if(camera_->isRunning() || ui_->imageView_source->cvImage().empty()) { dialog = new AddObjectDialog(camera_, cv::Mat(), ui_->imageView_source->isMirrorView(), this); }