comparison hgrunner.cpp @ 189:6bb510abe4f1

* Handle failure to start processes at all (e.g. because executable path is wrong)

 QString HgRunner::findExtension()
 {
     // If we haven't unbundled an extension, always do that (so that
     // it's available in case someone wants to use it later, e.g. to
     // fix a malfunctioning setup).  But the path we actually prefer
-    // is the one in the settings first; then the unbundled one; then
-    // anything in the path if for some reason unbundling failed
+    // is the one in the settings first, if it exists; then the
+    // unbundled one; then anything in the path if for some reason
+    // unbundling failed
 
     QSettings settings;
     settings.beginGroup("Locations");
 
     QString unbundled = getUnbundledFileName();
     if (!QFile(unbundled).exists()) {
         unbundled = unbundleExtension();
     }
 
     QString extpath = settings.value("extensionpath", "").toString();
-    if (extpath != "") return extpath;
+    if (extpath != "" && QFile(extpath).exists()) return extpath;
 
     extpath = unbundled;
     if (extpath == "") {
         extpath = findInPath("easyhg.py", m_myDirPath, false);
         if (extpath == "easyhg.py") {

     if (!checkPrompts(chunk)) {
         m_stdout += chunk;
     }
 }
 
+void HgRunner::error(QProcess::ProcessError)
+{
+    finished(-1, QProcess::CrashExit);
+}
+
 void HgRunner::finished(int procExitCode, QProcess::ExitStatus procExitStatus)
 {
     // Save the current action and reset m_currentAction before we
     // emit a signal to mark the completion; otherwise we may be
     // resetting the action after a slot has already tried to set it

 
     m_isRunning = false;
     m_currentAction = HgAction();
 
     closeProcInput();
-    delete m_proc;
+    m_proc->deleteLater();
     m_proc = 0;
 
     if (completedAction.action == ACT_NONE) {
         DEBUG << "HgRunner::finished: WARNING: completed action is ACT_NONE" << endl;
     } else {

     env.insert("LC_ALL", "en_US.utf8");
     env.insert("HGPLAIN", "1");
     m_proc->setProcessEnvironment(env);
 
     connect(m_proc, SIGNAL(started()), this, SLOT(started()));
+    connect(m_proc, SIGNAL(error(QProcess::ProcessError)),
+            this, SLOT(error(QProcess::ProcessError)));
     connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)),
             this, SLOT(finished(int, QProcess::ExitStatus)));
     connect(m_proc, SIGNAL(readyReadStandardOutput()),
             this, SLOT(dataReadyStdout()));
     connect(m_proc, SIGNAL(readyReadStandardError()),