Merge with default

2012-09-17 16:24:01 -04:00
parent fe427bc7f4 946c0e8256
commit f385fe2f20
25 changed files with 763 additions and 249 deletions
@@ -179,7 +179,7 @@ namespace MediaBrowser.Controller.IO

        public static bool IsShortcut(string filename)
        {
-            return Path.GetExtension(filename).EndsWith("lnk", StringComparison.OrdinalIgnoreCase);
+            return filename != null ? Path.GetExtension(filename).EndsWith("lnk", StringComparison.OrdinalIgnoreCase) : false;
        }
    }
 }