From ee7205bb8447d6f7482e45e1a8f39e2444a91e01 Mon Sep 17 00:00:00 2001
From: Feross Aboukhadijeh <feross@feross.org>
Date: Tue, 5 Apr 2016 19:01:12 -0700
Subject: [PATCH] Consistent error handling on all cast devices

---
 renderer/lib/cast.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/renderer/lib/cast.js b/renderer/lib/cast.js
index f53e4617..b9400669 100644
--- a/renderer/lib/cast.js
+++ b/renderer/lib/cast.js
@@ -24,7 +24,11 @@ var update
 function chromecastPlayer (player) {
   function addEvents () {
     player.on('error', function (err) {
-      player.errorMessage = err.message
+      state.playing.location = 'local'
+      state.errors.push({
+        time: new Date().getTime(),
+        message: 'Could not connect to Chromecast. ' + err.message
+      })
       update()
     })
     player.on('disconnect', function () {
@@ -41,6 +45,10 @@ function chromecastPlayer (player) {
     }, function (err) {
       if (err) {
         state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to Chromecast. ' + err.message
+        })
       } else {
         state.playing.location = 'chromecast'
       }
@@ -96,7 +104,7 @@ function airplayPlayer (player) {
         state.playing.location = 'local'
         state.errors.push({
           time: new Date().getTime(),
-          message: 'Couldn\'t connect to Airplay'
+          message: 'Could not connect to AirPlay.'
         })
       } else {
         state.playing.location = 'airplay'
@@ -151,7 +159,11 @@ function airplayPlayer (player) {
 function dlnaPlayer (player) {
   function addEvents () {
     player.on('error', function (err) {
-      player.errorMessage = err.message
+      state.playing.location = 'local'
+      state.errors.push({
+        time: new Date().getTime(),
+        message: 'Could not connect to DLNA. ' + err.message
+      })
       update()
     })
     player.on('disconnect', function () {
@@ -171,7 +183,7 @@ function dlnaPlayer (player) {
         state.playing.location = 'local'
         state.errors.push({
           time: new Date().getTime(),
-          message: 'Couldn\'t connect to DLNA. ' + err
+          message: 'Could not connect to DLNA. ' + err.message
         })
       } else {
         state.playing.location = 'dlna'