2 files changed, 13 insertions, 6 deletions
diff --git a/src/loop-play.js b/src/loop-play.js
index 66de65a..585414b 100644
--- a/src/loop-play.js
+++ b/src/loop-play.js
@@ -367,6 +367,8 @@ class PlayController extends EventEmitter {
 
         this.startNextDownload()
       })
+
+    return picked
   }
 
   playFile(file) {
@@ -374,6 +376,9 @@ class PlayController extends EventEmitter {
   }
 
   async skip() {
+    // TODO: It would be nice if this returned the next track, but that
+    // probably isn't possible with the current play/loop-setup.
+
     await this.player.kill()
     this.currentTrack = null
   }
@@ -384,7 +389,7 @@ class PlayController extends EventEmitter {
     }
 
     this.downloadController.cancel()
-    this.startNextDownload()
+    return this.startNextDownload()
   }
 
   async stop() {
diff --git a/src/play.js b/src/play.js
index 680e326..1416420 100755
--- a/src/play.js
+++ b/src/play.js
@@ -393,12 +393,14 @@ async function main(args) {
 
       if (Buffer.from([0x7f]).equals(data)) {
         clearConsoleLine()
-        console.log(
-          "Skipping the track that's up next. " +
-          "(Press I for track info!)"
-        )
+        console.log("Skipping the track that's up next.")
 
-        playController.skipUpNext()
+        playController.skipUpNext().then(nextTrack => {
+          console.log(
+            `New track up next: ${nextTrack.name || '(Unnamed)'}` +
+            " (Press I for track info!)"
+          )
+        })
       }
 
       if (equalsChar('i') || equalsChar('t')) {