From 09100c38503a12424f39ad286eb172f0fe9c6375 Mon Sep 17 00:00:00 2001
From: Jaroslav Barton <djaara@djaara.net>
Date: Thu, 30 Apr 2009 16:34:55 +0200
Subject: [PATCH] Release device called in new thread.

---
 src/FMEnroll.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/FMEnroll.cpp b/src/FMEnroll.cpp
index 844d9af..62f85c5 100644
--- a/src/FMEnroll.cpp
+++ b/src/FMEnroll.cpp
@@ -44,6 +44,7 @@ FMEnroll::FMEnroll(DeviceModel device, QString login, int finger, QWidget *paren
 	// Init and traslate UI components
 	initComponents(enrollStages);
 	retranslate();
+	animLabel->stop();
 	setMainWidget(mainPanel);
 	QObject::connect(timer, SIGNAL(timeout()), this, SLOT(timeout()));
 	
@@ -167,17 +168,16 @@ void FMEnroll::enrollStatus(QString result, bool done) {
 			actualStatus->setText(i18n("Enroll completed"));
 			stages[actualStage]->setChecked(true);
 			setButtons(KDialog::Ok);
-			dbc->enrollStop();
+			dbc->releaseDevice();
 		} else if (result == "enroll-disconnected") {
 			actualStatus->setText(i18n("Device disconected. Fingerprint is not enrolled."));
-			dbc->enrollStop();
-			dbc->releaseDevice();
+			QtConcurrent::run(dbc, &FMDbusConn::releaseDevice);
 		} else if (result == "enroll-failed") {
 			actualStatus->setText(i18n("Enroll failed."));
-			dbc->enrollStop();
+			QtConcurrent::run(dbc, &FMDbusConn::releaseDevice);
 		} else if (result == "enroll-unknown-error") {
 			actualStatus->setText(i18n("Unknown error."));
-			dbc->enrollStop();
+			QtConcurrent::run(dbc, &FMDbusConn::releaseDevice);
 		}
 		animLabel->stop();
 	} else setStatusMessage(result);
@@ -197,6 +197,7 @@ void FMEnroll::timeout() {
 	msg = msg.arg(i18n(fingerNames[finger_].name), device_.name);
 	actualStatus->setText(msg);
 	stages[actualStage]->clearStatus();
+	animLabel->start();
 }
 
 /**
@@ -218,7 +219,6 @@ FMEnroll::~FMEnroll() {
 	if (mainLayout) delete mainLayout;
 	if (mainPanel) delete mainPanel;
 	if (dbc) {
-		dbc->enrollStop();
 		dbc->releaseDevice();
 		dbc->releaseConn();
 	}
-- 
2.11.4.GIT