[Pkg-running-devel] [openambit] 21/131: Fixed qthread exit and invalid modification of main layout

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit b03dcc2946f8d93b0ad578a178e080225a485729
Author: Emil Ljungdahl <emil at kratern.se>
Date:   Sat Dec 14 16:04:28 2013 +0100

    Fixed qthread exit and invalid modification of main layout
---
 src/openambit/mainwindow.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/openambit/mainwindow.cpp b/src/openambit/mainwindow.cpp
index 89cdf4a..07f3337 100644
--- a/src/openambit/mainwindow.cpp
+++ b/src/openambit/mainwindow.cpp
@@ -69,6 +69,8 @@ MainWindow::MainWindow(QWidget *parent) :
 
 MainWindow::~MainWindow()
 {
+    deviceWorkerThread.quit();
+    deviceWorkerThread.wait();
     delete ui;
 }
 
@@ -141,13 +143,13 @@ void MainWindow::syncFinished(bool success)
         currentLogMessageRow->setStatus(LogMessageRow::StatusSuccess);
     }
     if (success) {
-        currentLogMessageRow = new LogMessageRow(this);
+        currentLogMessageRow = new LogMessageRow(0);
         currentLogMessageRow->setMessage(tr("Syncronization complete"));
         currentLogMessageRow->setStatus(LogMessageRow::StatusSuccess);
         ui->verticalLayoutLogMessages->addLayout(currentLogMessageRow);
     }
     else {
-        currentLogMessageRow = new LogMessageRow(this);
+        currentLogMessageRow = new LogMessageRow(0);
         currentLogMessageRow->setMessage(tr("Syncronization failed"));
         currentLogMessageRow->setStatus(LogMessageRow::StatusFailed);
         ui->verticalLayoutLogMessages->addLayout(currentLogMessageRow);
@@ -166,7 +168,7 @@ void MainWindow::syncProgressInform(QString message, bool newRow, quint8 percent
         if (currentLogMessageRow != NULL) {
             currentLogMessageRow->setStatus(LogMessageRow::StatusSuccess);
         }
-        currentLogMessageRow = new LogMessageRow(this);
+        currentLogMessageRow = new LogMessageRow(0);
         currentLogMessageRow->setMessage(message);
         currentLogMessageRow->setStatus(LogMessageRow::StatusRunning);
         ui->verticalLayoutLogMessages->addLayout(currentLogMessageRow);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git