Merge pull request #1409 from MediaBrowser/beta

merge from beta

2 files changed, 2 insertions, 17 deletions

diff --git a/MediaBrowser.ServerApplication/Native/Autorun.cs b/MediaBrowser.ServerApplication/Native/Autorun.cs
index 2cacaae8e..c384d0460 100644
--- a/MediaBrowser.ServerApplication/Native/Autorun.cs
+++ b/MediaBrowser.ServerApplication/Native/Autorun.cs
@@ -17,25 +17,10 @@ namespace MediaBrowser.ServerApplication.Native
         /// <param name="fileSystem">The file system.</param>
         public static void Configure(bool autorun, IFileSystem fileSystem)
         {
-            var shortcutPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Media Browser 3", "Media Browser Server.lnk");
-
-            if (!Directory.Exists(Path.GetDirectoryName(shortcutPath)))
-            {
-                shortcutPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Emby", "Emby Server.lnk");
-            }
+            var shortcutPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Emby", "Emby Server.lnk");
 
             var startupPath = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
 
-            // Remove lnk from old name
-            try
-            {
-                fileSystem.DeleteFile(Path.Combine(startupPath, Path.GetFileName(shortcutPath) ?? "Media Browser Server.lnk"));
-            }
-            catch
-            {
-                
-            }
-
             if (autorun)
             {
                 //Copy our shortut into the startup folder for this user
diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
index bff342d01..ceab5379d 100644
--- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs
+++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.ServerApplication.Native
 
             if (!System.Environment.Is64BitProcess)
             {
-                list.Add(typeof(PismoIsoManager).Assembly);
+                //list.Add(typeof(PismoIsoManager).Assembly);
             }
 
             list.Add(GetType().Assembly);