From 07ae00f20715b8a5c0ab814c31c50c9b49d5edca Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 19 Aug 2015 19:33:48 +0200
Subject: [PATCH] Close WebSocket properly after ScriptEngine finished running

---
 libraries/script-engine/src/WebSocketServerClass.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/script-engine/src/WebSocketServerClass.cpp b/libraries/script-engine/src/WebSocketServerClass.cpp
index 7981d67de3..9fc060e61c 100644
--- a/libraries/script-engine/src/WebSocketServerClass.cpp
+++ b/libraries/script-engine/src/WebSocketServerClass.cpp
@@ -40,7 +40,9 @@ QScriptValue WebSocketServerClass::constructor(QScriptContext* context, QScriptE
             serverName = serverNameOption.toString();
         }
     }
-    return engine->newQObject(new WebSocketServerClass(engine, serverName, port));
+    auto webSocketServerClass = new WebSocketServerClass(engine, serverName, port);
+    connect(engine, SIGNAL(finished(const QString&)), webSocketServerClass, SLOT(deleteLater()));
+    return engine->newQObject(webSocketServerClass);
 }
 
 WebSocketServerClass::~WebSocketServerClass() {