Ticket #6873: HelpWindow.patch

Code/Mantid/MantidPlot/src/ApplicationWindow.cpp

@@ -9555 +9555 @@
   m_scriptInterpreter->shutdown();
   scriptingEnv()->finalize();
 
+  // Help window
+  HelpWindow::Instance().hostShuttingDown();
+
   ce->accept();
 
 }

Code/Mantid/MantidQt/API/inc/MantidQtAPI/HelpWindow.h

@@ -19 +19 @@
     void showAlgorithm(const std::string &name=std::string(), const int version=-1);
     void showAlgorithm(const QString &name, const int version=-1);
     void showFitFunction(const std::string &name=std::string());
+    void hostShuttingDown();
 
 private:
     friend struct Mantid::Kernel::CreateUsingNew<HelpWindowImpl>;

Code/Mantid/MantidQt/API/src/HelpWindow.cpp

@@ -114 +114 @@
 }
 
 /**
+ * Can be called by the host process to indicate that it will
+ * close soon. This closes the help window & releases the QProcess
+ */
+void HelpWindowImpl::hostShuttingDown()
+{
+  if(m_process)
+  {
+    m_process->kill();
+    // Delete
+    m_process.reset();
+  }
+}
+
+
+/**
  * Start up the help browser in a separate process.
  *
  * This will only do something if the browser is not already