refactor command line program

- made launching players more consistent
- fixed flush screen bug
- style fixes

1 files changed, 5 insertions, 4 deletions

diff --git a/index.js b/index.js
index df4fd3c..32efcda 100644
--- a/index.js
+++ b/index.js
@@ -21,9 +21,10 @@ inherits(WebTorrent, Client)
 function WebTorrent (opts) {
   var self = this
   opts = opts || {}
-
   Client.call(self, opts)
 
+  self.listening = false
+
   if (opts.list) {
     return
   }
@@ -34,6 +35,7 @@ function WebTorrent (opts) {
     self.server.on('request', self._onRequest.bind(self))
     self.server.listen(opts.port)
     self.server.once('listening', function () {
+      self.listening = true
       self.emit('listening')
     })
   }
@@ -125,7 +127,6 @@ WebTorrent.prototype.add = function (torrentId, opts, cb) {
  */
 WebTorrent.prototype.destroy = function (cb) {
   var self = this
-
   var tasks = [
     Client.prototype.destroy.bind(self)
   ]
@@ -135,13 +136,13 @@ WebTorrent.prototype.destroy = function (cb) {
       try {
         self.server.close(cb)
       } catch (err) {
-        cb(null) // ignore error, server was either already closed / not yet listening
+        // ignore error, server was already closed or not listening
+        cb(null)
       }
     })
   }
 
   parallel(tasks, cb)
-
   return self
 }