Merge release-next into ornl-next

Author: mantid-builder

docs/source/release/v6.11.0/Inelastic/Bugfixes/38116.rst

@@ -0,0 +1 @@
+- Fixed a crash on the :ref:`Inelastic Bayes Fitting <interface-inelastic-bayes-fitting>` when closing the interface while it is loading data.

qt/widgets/common/inc/MantidQtWidgets/Common/MockQtAlgorithmRunner.h

@@ -19,7 +19,6 @@ GNU_DIAG_OFF_SUGGEST_OVERRIDE
 class MockQtAlgorithmRunner : public QtAlgorithmRunner {
 public:
   MockQtAlgorithmRunner() = default;
-  MOCK_METHOD0(cancelRunningAlgorithm, void());
   MOCK_METHOD1(startAlgorithmImpl, void(Mantid::API::IAlgorithm_sptr));
   MOCK_CONST_METHOD0(getAlgorithm, Mantid::API::IAlgorithm_sptr());
 

qt/widgets/common/inc/MantidQtWidgets/Common/QtAlgorithmRunner.h

@@ -36,7 +36,7 @@ class EXPORT_OPT_MANTIDQT_COMMON QtAlgorithmRunner : public QObject {
   explicit QtAlgorithmRunner(QObject *parent = nullptr);
   ~QtAlgorithmRunner() override;
 
-  virtual void cancelRunningAlgorithm();
+  void cancelRunningAlgorithm();
 
   virtual void startAlgorithm(Mantid::API::IAlgorithm_sptr alg);
   virtual Mantid::API::IAlgorithm_sptr getAlgorithm() const;

qt/widgets/common/src/QtAlgorithmRunner.cpp

@@ -13,25 +13,12 @@ using namespace Mantid::API;
 
 namespace MantidQt::API {
 
-//----------------------------------------------------------------------------------------------
-/** Constructor
- */
 QtAlgorithmRunner::QtAlgorithmRunner(QObject *parent)
     : QObject(parent), m_finishedObserver(*this, &QtAlgorithmRunner::handleAlgorithmFinishedNotification),
       m_progressObserver(*this, &QtAlgorithmRunner::handleAlgorithmProgressNotification),
       m_errorObserver(*this, &QtAlgorithmRunner::handleAlgorithmErrorNotification), m_asyncResult(nullptr) {}
 
-//----------------------------------------------------------------------------------------------
-/** Destructor
- */
-QtAlgorithmRunner::~QtAlgorithmRunner() {
-  if (m_asyncAlg) {
-    m_asyncAlg->removeObserver(m_finishedObserver);
-    m_asyncAlg->removeObserver(m_errorObserver);
-    m_asyncAlg->removeObserver(m_progressObserver);
-  }
-  delete m_asyncResult;
-}
+QtAlgorithmRunner::~QtAlgorithmRunner() { cancelRunningAlgorithm(); }
 
 //--------------------------------------------------------------------------------------
 /** If an algorithm is already running, cancel it.