From c0e6030ba35c71799509983cffd005a0f5f7fe4c Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Mon, 10 Oct 2016 21:36:29 +0100
Subject: [PATCH] FIXED!!!!! YES BITCH! #550

---
 PlexRequests.Services/Jobs/RecentlyAdded.cs | 7 ++++++-
 PlexRequests.UI/Modules/BaseAuthModule.cs   | 9 ++++++---
 PlexRequests.UI/Modules/UserLoginModule.cs  | 4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/PlexRequests.Services/Jobs/RecentlyAdded.cs b/PlexRequests.Services/Jobs/RecentlyAdded.cs
index f6b47aab8..3a744bb6b 100644
--- a/PlexRequests.Services/Jobs/RecentlyAdded.cs
+++ b/PlexRequests.Services/Jobs/RecentlyAdded.cs
@@ -147,7 +147,12 @@ namespace PlexRequests.Services.Jobs
                 sb.AppendFormat("<a href=\"https://www.imdb.com/title/{0}/\"><h3 style=\"font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{1} {2}</p></a>",
                     info.ImdbId, info.Title, info.ReleaseDate?.ToString("yyyy") ?? string.Empty);
 
-                sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">Genre: {0}</p>", string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray()));
+                if (info.Genres.Any())
+                {
+                    sb.AppendFormat(
+                        "<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">Genre: {0}</p>",
+                        string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray()));
+                }
                 sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{0}</p>", info.Overview);
 
                 sb.Append("<td");
diff --git a/PlexRequests.UI/Modules/BaseAuthModule.cs b/PlexRequests.UI/Modules/BaseAuthModule.cs
index d3d3de5d9..e1a3a26de 100644
--- a/PlexRequests.UI/Modules/BaseAuthModule.cs
+++ b/PlexRequests.UI/Modules/BaseAuthModule.cs
@@ -64,9 +64,12 @@ namespace PlexRequests.UI.Modules
 
             var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin";
 
-            return Session[SessionKeys.UsernameKey] == null
-                ? Context.GetRedirect(redirectPath)
-                : null;
+            if (Session[SessionKeys.UsernameKey] == null && Context?.CurrentUser == null)
+            {
+                return Context.GetRedirect(redirectPath);
+            }
+
+            return null;
         }
     }
 }
diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs
index 713f43987..7e7d1dc42 100644
--- a/PlexRequests.UI/Modules/UserLoginModule.cs
+++ b/PlexRequests.UI/Modules/UserLoginModule.cs
@@ -65,8 +65,8 @@ namespace PlexRequests.UI.Modules
             {
                 if (!string.IsNullOrEmpty(Username) || IsAdmin)
                 {
-                    var uri = Linker.BuildRelativeUri(Context, "SearchIndex");
-                    return Response.AsRedirect(uri.ToString()); 
+                    var url = Linker.BuildAbsoluteUri(Context, "SearchIndex").ToString();
+                    return Response.AsRedirect(url); 
                 }
                 var settings = await AuthService.GetSettingsAsync();
                 return View["Index", settings];