Fix left parameter for asynchronous behaviour

1 files changed, 16 insertions, 8 deletions

diff --git a/lib/torrent.js b/lib/torrent.js
index 0254b87..abf439b 100644
--- a/lib/torrent.js
+++ b/lib/torrent.js
@@ -277,6 +277,19 @@ class Torrent extends EventEmitter {
   }
 
   _onListening () {
+    if (this.destroyed) return
+
+    if (this.info) {
+      // if full metadata was included in initial torrent id, use it immediately. Otherwise,
+      // wait for torrent-discovery to find peers and ut_metadata to get the metadata.
+      this._onMetadata(this)
+    } else {
+      if (this.xs) this._getMetadataFromServer()
+      this._startDiscovery()
+    }
+  }
+
+  _startDiscovery () {
     if (this.discovery || this.destroyed) return
 
     let trackerOpts = this.client.tracker
@@ -300,14 +313,6 @@ class Torrent extends EventEmitter {
       })
     }
 
-    if (this.info) {
-      // if full metadata was included in initial torrent id, use it immediately. Otherwise,
-      // wait for torrent-discovery to find peers and ut_metadata to get the metadata.
-      this._onMetadata(this)
-    } else if (this.xs) {
-      this._getMetadataFromServer()
-    }
-
     // begin discovering peers via DHT and trackers
     this.discovery = new Discovery({
       infoHash: this.infoHash,
@@ -611,6 +616,9 @@ class Torrent extends EventEmitter {
     if (this.destroyed) return
     this._debug('on store')
 
+    // Start discovery before emitting 'ready'
+    this._startDiscovery()
+
     this.ready = true
     this.emit('ready')