From 5623c1024ee22b8c4a8b91972508e53f87ef17a4 Mon Sep 17 00:00:00 2001
From: Mathias Rasmussen <mathiasvr@gmail.com>
Date: Wed, 28 Sep 2016 22:59:34 +0200
Subject: [PATCH] delay external player if server is not ready

---
 src/renderer/controllers/media-controller.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/renderer/controllers/media-controller.js b/src/renderer/controllers/media-controller.js
index 10cfe70b..2f778ffe 100644
--- a/src/renderer/controllers/media-controller.js
+++ b/src/renderer/controllers/media-controller.js
@@ -56,12 +56,18 @@ module.exports = class MediaController {
 
   openExternalPlayer () {
     const state = this.state
-    const mediaURL = Playlist.getCurrentLocalURL(this.state)
-    ipcRenderer.send('openExternalPlayer',
-      state.saved.prefs.externalPlayerPath,
-      mediaURL,
-      state.window.title)
     state.playing.location = 'external'
+
+    let open = function () {
+      const mediaURL = Playlist.getCurrentLocalURL(state)
+      ipcRenderer.send('openExternalPlayer',
+        state.saved.prefs.externalPlayerPath,
+        mediaURL,
+        state.window.title)
+    }
+
+    if (state.server != null) open()
+    else ipcRenderer.once('wt-server-running', open)
   }
 
   externalPlayerNotFound () {