Account for IOaccounting on multiDrives (#462)

Fixes #459

Author: procount

recovery/mainwindow.cpp

@@ -1583,6 +1583,7 @@ void MainWindow::startImageWrite()
     connect(imageWriteThread, SIGNAL(statusUpdate(QString)), _qpd, SLOT(setLabelText(QString)));
     connect(imageWriteThread, SIGNAL(runningMKFS()), _qpd, SLOT(pauseIOaccounting()), Qt::BlockingQueuedConnection);
     connect(imageWriteThread, SIGNAL(finishedMKFS()), _qpd , SLOT(resumeIOaccounting()), Qt::BlockingQueuedConnection);
+    connect(imageWriteThread, SIGNAL(newDrive(const QString&)), _qpd , SLOT(changeDrive(const QString&)), Qt::BlockingQueuedConnection);
     imageWriteThread->start();
     hide();
     _qpd->exec();

recovery/multiimagewritethread.cpp

@@ -459,6 +459,7 @@ bool MultiImageWriteThread::processImage(OsInfo *image)
         }
 
         QByteArray partdevice = p->partitionDevice();
+        emit newDrive(partdevice);
 
         if (fstype == "raw")
         {

recovery/multiimagewritethread.h

@@ -52,7 +52,8 @@ class MultiImageWriteThread : public QThread
     void completed();
     void runningMKFS();
     void finishedMKFS();
-    
+    void newDrive(const QString&);
+
 public slots:
 
 };

recovery/progressslideshowdialog.cpp

@@ -123,6 +123,13 @@ void ProgressSlideshowDialog::resumeIOaccounting()
     _iotimer.start(1000);
 }
 
+void ProgressSlideshowDialog::changeDrive(const QString &drive)
+{
+    pauseIOaccounting();
+    _drive = drive;
+    resumeIOaccounting();
+}
+
 void ProgressSlideshowDialog::setMaximum(qint64 bytes)
 {
     _maxSectors = bytes/512;

recovery/progressslideshowdialog.h

@@ -35,6 +35,7 @@ public slots:
     void updateIOstats();
     void pauseIOaccounting();
     void resumeIOaccounting();
+    void changeDrive(const QString &drive);
 
 protected:
     QString _drive;