Starting to redesign server communication.

1 files changed, 11 insertions, 4 deletions

diff --git a/plexgdm.cpp b/plexgdm.cpp
index dae0df3..e76279d 100644
--- a/plexgdm.cpp
+++ b/plexgdm.cpp
@@ -59,15 +59,18 @@ std::string plexgdm::getClientDetails()
 
 void plexgdm::Action()
 {
-	
-	// Get remote Resources
-	Plexservice::UpdateResources();
-	
 	if(Config::GetInstance().UseConfiguredServer) {
 		// Adds a Server to vector
 		GetServer(Config::GetInstance().s_serverHost, Config::GetInstance().ServerPort);
+
+		if(Config::GetInstance().UsePlexAccount) {
+			GetServer(Config::GetInstance().s_serverHost, Config::GetInstance().ServerPort)->SetAuthToken(Plexservice::GetMyPlexToken());
+		}
 	}
 	
+	// Get remote Resources
+	Plexservice::UpdateResources();
+	
 	char buffer[1024];
 	m_registrationIsRunning = true;
 	m_discoveryIsRunning = true;
@@ -177,6 +180,10 @@ void plexgdm::discover()
 			}
 			if(flag) {
 				m_vServers.push_back(PlexServer(data, host));
+				// Set token for local servers
+				if(Config::GetInstance().UsePlexAccount) {
+					m_vServers[m_vServers.size()-1].SetAuthToken(Plexservice::GetMyPlexToken());
+				}
 				isyslog("[plex] New Server Discovered: %s", host.c_str());
 			}
 		}