From 13e6819dddfc34933acae9fadfcb9e174d96810b Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Sat, 9 Mar 2013 10:11:06 -0500 Subject: [PATCH 1/2] Check location type in CreateResolveArgs --- MediaBrowser.Controller/Entities/BaseItem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index cc3ec5c2ae..a69b423acd 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -313,7 +313,7 @@ namespace MediaBrowser.Controller.Entities var path = Path; // non file-system entries will not have a path - if (string.IsNullOrEmpty(path)) + if (this.LocationType != LocationType.FileSystem || string.IsNullOrEmpty(path)) { return new ItemResolveArgs(ConfigurationManager.ApplicationPaths) { From 6fc8a8c04d4296e3d6e11ad43f684dae9dfe8282 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Sat, 9 Mar 2013 10:11:22 -0500 Subject: [PATCH 2/2] Fix uninstaller path --- MediaBrowser.Installer/MediaBrowser.Installer.csproj | 2 +- MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj index debb7163f3..473e8d37ab 100644 --- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj +++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj @@ -31,7 +31,7 @@ Media Browser Team Media Browser false - 35 + 36 0.1.1.%2a false true diff --git a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs index 3064115e30..4e2e807878 100644 --- a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs +++ b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs @@ -52,7 +52,7 @@ namespace MediaBrowser.Uninstaller.Execute case "mbt": Product = "Theater"; - RootSuffix = "-UI"; + RootSuffix = "-Theater"; break; default: