Added fix for MHA-655

Author: Mykola Tryshnivskyy

src/ServerThread.cc

@@ -0,0 +1,7 @@
+#include "ServerThread.h"
+#include "WebDriver.h"
+
+void ServerThread::run()
+{
+  main_server(argc, argv);
+}

src/ServerThread.h

@@ -0,0 +1,18 @@
+#ifndef SERVERTHREAD_H
+#define SERVERTHREAD_H
+
+#include <QtCore/QThread>
+
+class ServerThread : public QThread
+{
+  Q_OBJECT
+
+public:
+  int   argc;
+  char** argv;
+  
+protected:
+  void run();
+};
+
+#endif // SERVERTHREAD_H

src/Test/main.cc

@@ -16,6 +16,38 @@
 
 #include <WebDriver.h>
 
+#if defined(_WIN32)
+#include <windows.h>
+#include <signal.h>
+#endif
+
+#include "ServerThread.h"
+
+ServerThread* pServerThread;
+ 
+#if defined(_WIN32)
+BOOL CtrlHandler(DWORD fdwCtrlType)
+{
+  switch (fdwCtrlType)
+  {
+    // Handle the CTRL-C signal.
+    case CTRL_BREAK_EVENT:
+    case CTRL_C_EVENT:
+      qDebug() << "try to stop thread";
+      pServerThread->terminate();
+      
+      while (!pServerThread->isFinished()) {}
+ 
+      if (!pServerThread->isRunning())
+        qDebug() << "thread is stopped";
+
+      return TRUE;
+      
+    default:
+      return FALSE;
+  }
+}
+#endif //_WIN32
 
 int main(int argc, char *argv[])
 {
@@ -39,11 +71,21 @@ int main(int argc, char *argv[])
     QWebSettings::globalSettings()->setOfflineWebApplicationCachePath("./web/html5");
 
 //    registerView<QWebView>("QWebView");
+#if defined(_WIN32)
+    SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, TRUE);
+#endif //_WIN32
 
-    QFutureWatcher<int> watcher;
-    QObject::connect(&watcher, SIGNAL(finished()), qApp, SLOT(quit()));
-    QFuture<int> future = QtConcurrent::run(main_server, argc, argv);
-    watcher.setFuture(future);
+    //QFutureWatcher<int> watcher;
+    //QObject::connect(&watcher, SIGNAL(finished()), qApp, SLOT(quit()));
+    //QFuture<int> future = QtConcurrent::run(main_server, argc, argv);
+    //watcher.setFuture(future);
+    pServerThread = new ServerThread;
+    QObject::connect(pServerThread, SIGNAL(finished()), qApp, SLOT(quit()));
 
+    pServerThread->argc = argc;
+    pServerThread->argv = argv;
+    pServerThread->start();
+       
     return app.exec();
 }
+

wd.gyp

@@ -385,6 +385,7 @@
         '<(INTERMEDIATE_DIR)/moc_qtaskrunner.cc',
         '<(INTERMEDIATE_DIR)/moc_qwebviewext.cc',
         '<(INTERMEDIATE_DIR)/moc_webdriver_automation.cc',
+        '<(INTERMEDIATE_DIR)/moc_ServerThread.cc',
         'src/net/base/file_stream.cc',
         'src/net/base/file_stream_metrics.cc',
         'src/net/base/file_stream_net_log_parameters.cc',
@@ -397,6 +398,8 @@
         'src/qwebviewext.cc',
         'src/third_party/webdriver/atoms.cc',
         'src/viewfactory.cc',
+        'src/ServerThread.h',
+        'src/ServerThread.cc',
       ],
 
       'conditions': [