From 33458c1bdbd832c5d6bc7be05019ae51697b1da8 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Tue, 17 May 2016 21:10:05 -0700
Subject: [PATCH] Make sure current activity returned sessions when refreshing

---
 data/interfaces/default/index.html          |  5 +++++
 data/interfaces/default/recently_added.html |  3 +--
 plexpy/webserve.py                          | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index e844b9fe..4100048b 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -107,6 +107,11 @@
                 $('#dashboard-checking-activity').remove();
 
                 var current_activity = $.parseJSON(xhr.responseText);
+                if (!(current_activity)) {
+                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.</div>');
+                    return
+                }
+
                 var stream_count = parseInt(current_activity.stream_count);
                 var sessions = current_activity.sessions;
 
diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html
index a1f6440a..6f3a2a59 100644
--- a/data/interfaces/default/recently_added.html
+++ b/data/interfaces/default/recently_added.html
@@ -109,6 +109,5 @@ DOCUMENTATION :: END
     </div>
 </div>
 % else:
-<div class="text-muted">There was an error communicating with your Plex Server. Please check your <a href="settings">settings</a>.
-</div><br>
+<div class="text-muted">There was an error communicating with your Plex Server.</div><br>
 % endif
\ No newline at end of file
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 4b554882..5edf715a 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -3618,13 +3618,13 @@ class WebInterface(object):
         pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
         result = pms_connect.get_current_activity()
 
-        data_factory = datafactory.DataFactory()
-        for session in result['sessions']:
-            if not session['ip_address']:
-                ip_address = data_factory.get_session_ip(session['session_key'])
-                session['ip_address'] = ip_address
-
         if result:
+            data_factory = datafactory.DataFactory()
+            for session in result['sessions']:
+                if not session['ip_address']:
+                    ip_address = data_factory.get_session_ip(session['session_key'])
+                    session['ip_address'] = ip_address
+
             return result
         else:
             logger.warn(u"Unable to retrieve data for get_activity.")