embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix git merging badly

This commit is contained in:
Anthony Laibe 2018-10-03 15:28:00 +01:00 committed by Pascal Precht
parent e13c0b3724
commit bdd5852b6c
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/modules/webserver/server.js
View File

@ -44,10 +44,11 @@ class Server {
wss.clients.forEach(function (client) { wss.clients.forEach(function (client) {
client.send('outputDone'); client.send('outputDone');
}); });
self.events.on('outputError', () => { });
if (ws.readyState === WEB_SOCKET_STATE_OPEN) {
return ws.send('outputError'); self.events.on('outputError', () => {
} wss.clients.forEach(function (client) {
client.send('outputError');
}); });
}); });