From 57d7e9fccc1434d51876ab9baf23c20c80140706 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 12 May 2013 10:06:08 -0400
Subject: fixes #268 - (Multicd) Albums with discnumbers in subfolders on
 filesystem = Multiple album objects

---
 MediaBrowser.Api/BaseApiService.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Api/BaseApiService.cs')

diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index ee90d2134..23d9b0126 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -128,7 +128,12 @@ namespace MediaBrowser.Api
 
                 if (auth.ContainsKey("UserId"))
                 {
-                    user = UserManager.GetUserById(new Guid(auth["UserId"]));
+                    var userId = auth["UserId"];
+
+                    if (!string.IsNullOrEmpty(userId))
+                    {
+                        user = UserManager.GetUserById(new Guid(userId));
+                    }
                 }
 
                 var deviceId = auth["DeviceId"];
-- 
cgit v1.2.3