diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-14 15:53:03 -0400 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-14 15:53:03 -0400 |
| commit | 08f0ba83357e95f4d2aa289bd893bae9b7c1d2bb (patch) | |
| tree | cfb4a0e1de9cf14af33285aa335b254c16695798 /MediaBrowser.Common.Implementations/BaseApplicationHost.cs | |
| parent | fe1834e6be044f0fdbe68fb34122c680f29ae04d (diff) | |
| parent | 0ce5fc7799cd4d234d953243d664cc35e7c65eab (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Common.Implementations/BaseApplicationHost.cs')
| -rw-r--r-- | MediaBrowser.Common.Implementations/BaseApplicationHost.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 1789ab298..40c91979d 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -500,14 +500,14 @@ namespace MediaBrowser.Common.Implementations if (ConfigurationManager.CommonConfiguration.RunAtStartup) { //Copy our shortut into the startup folder for this user - File.Copy(ProductShortcutPath, Environment.GetFolderPath(Environment.SpecialFolder.Startup), true); + File.Copy(ProductShortcutPath, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup),Path.GetFileName(ProductShortcutPath) ?? "MBstartup.lnk"), true); } else { //Remove our shortcut from the startup folder for this user try { - File.Delete(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), Path.GetFileName(ProductShortcutPath))); + File.Delete(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), Path.GetFileName(ProductShortcutPath) ?? "MBstartup.lnk")); } catch (FileNotFoundException) { |