Follow through on some Transaction warnings, to make them more useful

libdiscover/Transaction/Transaction.cpp

@@ -40,8 +40,8 @@ Transaction::~Transaction()
 {
     if(status()<DoneStatus || TransactionModel::global()->contains(this)) {
         qWarning() << "destroying Transaction before it's over" << this;
+        TransactionModel::global()->removeTransaction(this);
     }
-    TransactionModel::global()->removeTransaction(this);
 }
 
 AbstractResource *Transaction::resource() const

libdiscover/Transaction/TransactionModel.cpp

@@ -171,9 +171,10 @@ void TransactionModel::addTransaction(Transaction *trans)
 void TransactionModel::removeTransaction(Transaction *trans)
 {
     Q_ASSERT(trans);
+    trans->deleteLater();
     int r = m_transactions.indexOf(trans);
     if (r<0) {
-        qWarning() << "transaction not part of the model already" << trans;
+        qWarning() << "transaction not part of the model" << trans;
         return;
     }
 
@@ -186,7 +187,6 @@ void TransactionModel::removeTransaction(Transaction *trans)
     emit transactionRemoved(trans);
     if (m_transactions.isEmpty())
         emit lastTransactionFinished();
-    trans->deleteLater();
 }
 
 void TransactionModel::transactionChanged(int role)