comparison src/hgrunner.cpp @ 489:86cdaa346e59

Merge

 
 #ifndef Q_OS_WIN32
 #include <unistd.h>
 #include <termios.h>
 #include <fcntl.h>
+#else
+#include <process.h>
 #endif
 
 HgRunner::HgRunner(QString myDirPath, QWidget * parent) :
     QProgressBar(parent),
     m_myDirPath(myDirPath)

         // We require a working directory, never just operate in pwd
         emit commandFailed(action, "EasyMercurial: No working directory supplied, will not run Mercurial command without one");
         return;
     }
 
-    QSettings settings;
-    settings.beginGroup("General");
-
     if (executable == "") {
         // This is a Hg command
         executable = getHgBinaryName();
         if (executable == "") executable = "hg";
 

         }
 
         if (action.mayBeInteractive()) {
             params.push_front("ui.interactive=true");
             params.push_front("--config");
+            QSettings settings;
             if (settings.value("useextension", true).toBool()) {
                 params = addExtensionOptions(params);
             }
             interactive = true;
         }