From ee5d9b0a52a7f356b4405bc87211317ca2f1e3e6 Mon Sep 17 00:00:00 2001 From: papoteur-mga Date: Tue, 28 Oct 2014 21:19:05 +0100 Subject: Correction of check being launched after stopping. --- mageiaSync/mageiaSyncExt.py | 4 +++- mageiaSync/mageiasync.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mageiaSync/mageiaSyncExt.py b/mageiaSync/mageiaSyncExt.py index 135d80c..ebd224f 100644 --- a/mageiaSync/mageiaSyncExt.py +++ b/mageiaSync/mageiaSyncExt.py @@ -122,6 +122,7 @@ class syncThread(QThread): try: self.process.terminate() self.lvM.emit("Process rsync stopped") + self.list=[] except: self.lvM.emit("Process rsync already stopped") # Init progressbar and speed counter @@ -186,9 +187,10 @@ class syncThread(QThread): if self.process.returncode != None: break self.lvM.emit("Ending with "+iso['nameWithPath']) - self.checkSignal.emit(iso['row']) if self.stopped: break + else: + self.checkSignal.emit(iso['row']) self.endSignal.emit(0) self.speedSignal.emit(0) self.progressSignal.emit(0) diff --git a/mageiaSync/mageiasync.py b/mageiaSync/mageiasync.py index 4faf149..26fa20b 100644 --- a/mageiaSync/mageiasync.py +++ b/mageiaSync/mageiasync.py @@ -155,7 +155,10 @@ class IsosViewer(QMainWindow, mageiaSyncUI.Ui_mainWindow): # launches a thread for each iso newThread=mageiaSyncExt.checkThread(self) self.checkThreads.append(newThread) - self.checkThreads[-1].setup(self.destination,self.model.data(self.model.index(isoIndex,0)) ,self.model.data(self.model.index(isoIndex,1)),isoIndex) + self.checkThreads[-1].setup(self.destination, + self.model.data(self.model.index(isoIndex,0)) , + self.model.data(self.model.index(isoIndex,1)), + isoIndex) self.checkThreads[-1].md5Signal.connect(self.md5Check) self.checkThreads[-1].sha1Signal.connect(self.sha1Check) self.checkThreads[-1].dateSignal.connect(self.dateCheck) -- cgit v1.2.1