Merge pull request #797 from tidusjar/dev

#788 fixed!
Ombi-app · Dec 16, 2016 · 485d7e9 · 485d7e9
2 parents 5002236 + ce95fe4
commit 485d7e9
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs
@@ -232,12 +232,25 @@ private async Task<Response> LoginUser()
                 {
                     if (!settings.UserAuthentication)// Do not need to auth make admin use login screen for now TODO remove this
                     {
-                        var perms = (Permissions)dbUser.Permissions;
-                        if (perms.HasFlag(Permissions.Administrator))
+                        if (dbUser != null)
                         {
-                            var uri = Linker.BuildRelativeUri(Context, "UserLoginIndex");
-                            Session["TempMessage"] = Resources.UI.UserLogin_AdminUsePassword;
-                            return Response.AsRedirect(uri.ToString());
+                            var perms = (Permissions) dbUser.Permissions;
+                            if (perms.HasFlag(Permissions.Administrator))
+                            {
+                                var uri = Linker.BuildRelativeUri(Context, "UserLoginIndex");
+                                Session["TempMessage"] = Resources.UI.UserLogin_AdminUsePassword;
+                                return Response.AsRedirect(uri.ToString());
+                            }
+                        }
+                        if (plexLocal != null)
+                        {
+                            var perms = (Permissions)plexLocal.Permissions;
+                            if (perms.HasFlag(Permissions.Administrator))
+                            {
+                                var uri = Linker.BuildRelativeUri(Context, "UserLoginIndex");
+                                Session["TempMessage"] = Resources.UI.UserLogin_AdminUsePassword;
+                                return Response.AsRedirect(uri.ToString());
+                            }
                         }
                     }
                 }