Clear command Queue before unpacking archives

4 files changed, 9 insertions, 2 deletions

diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index 566919b..5dbc612 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -484,6 +484,7 @@ void FilesystemWidget::unpack(){
     QModelIndexList selectedIdxs = mFileView->selectionModel()->selectedRows();
     mUnpackDlg->clearOutput();
     mUnpackDlg->setCloseEnabled(false);
+    mUnpackDlg->clearCommandQueue();
     mUnpackDlg->show();
     foreach(QModelIndex idx, selectedIdxs){
         QString mimeType = idx.data(SmDirModel::TypeRole).toString();
diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp
index 26f1b53..b56dd48 100644
--- a/mappingtreewidget.cpp
+++ b/mappingtreewidget.cpp
@@ -331,7 +331,9 @@ void MappingEditWidget::removeMapping(){
     }
     QModelIndex firstIdx = sel.first();
     if(firstIdx.isValid()){
-        mResultModel->removeRows(firstIdx.row(), 1, firstIdx.parent());
+        int row = firstIdx.row();
+        QModelIndex p = firstIdx.parent();
+        mResultModel->removeRows(row, 1, p);
     }
 }
 
diff --git a/smdialog.cpp b/smdialog.cpp
index a15c22e..9f168f8 100644
--- a/smdialog.cpp
+++ b/smdialog.cpp
@@ -81,7 +81,6 @@ UnpackDialog::UnpackDialog(QWidget *parent, Qt::WindowFlags f) : SmDialog(parent
     mUnpacker = new Unpacker(this);
     connect(mUnpacker, SIGNAL(outputRead(QByteArray)), this, SLOT(addProcOutput(QByteArray)));
     connect(mUnpacker, SIGNAL(unpackStarted(QString)), this, SLOT(newPackage(QString)));
-    //connect(mUnpacker, SIGNAL(unpackStarted(QStringList)), this, SLOT(newPackage(QStringList)));
     connect(mUnpacker, SIGNAL(unpackDone()), this, SLOT(unpackDone()));
 }
 
@@ -97,6 +96,10 @@ void UnpackDialog::setCloseEnabled(bool enabled){
     mClose->setEnabled(enabled);
 }
 
+void UnpackDialog::clearCommandQueue(){
+    mCommandQueue.clear();
+}
+
 void UnpackDialog::addOutput(const QString &msg, const QString &prepend){
     QTextCursor cur = mOutput->textCursor();
     QTextBlock block = cur.block();
diff --git a/smdialog.h b/smdialog.h
index 144502f..6d1c9fb 100644
--- a/smdialog.h
+++ b/smdialog.h
@@ -50,6 +50,7 @@ class UnpackDialog : public SmDialog {
         void setCurrentLabel(const QString &cur);
         void clearOutput();
         void setCloseEnabled(bool enabled);
+        void clearCommandQueue();
 
     signals:
         void workFinished();