[fix] don't return the 'connect' emit in case there is a callback and…

… ensure the socket is closed before emitting close on the client
nodejitsu · May 6, 2013 · a9a6719 · a9a6719
1 parent 7f5ba3a
commit a9a6719
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/godot/net/client.js b/lib/godot/net/client.js
@@ -198,7 +198,7 @@ Client.prototype.connect = function (port, host, callback) {
       if (connectBackoff) {
         connectBackoff.reset();
       }
-      return self.emit('connect');
+      self.emit('connect');
     });
   }
 
@@ -227,6 +227,8 @@ Client.prototype.connect = function (port, host, callback) {
 // Closes the underlying network connection for this client.
 //
 Client.prototype.close = function () {
+  var self = this;
+
   if (this.type === 'tcp' || this.type === 'unix') {
     this.socket.destroy();
   }
@@ -240,5 +242,7 @@ Client.prototype.close = function () {
     self.remove(self.producers[id]);
   });
 
-  return this.emit('close');
+  this.socket.on('close', function () {
+    self.emit('close');
+  });
 };