diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-09 10:24:44 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-09 10:24:44 -0500 |
| commit | 73f6b33a4cbe9b1310e6811ac0072da7b9ecb826 (patch) | |
| tree | 6dd3ec3d396a1b0b5d6dab4dd28a4dc67f12fa2f | |
| parent | 5591e05fdbe586abbde6964ed75b523732e3e573 (diff) | |
| parent | 6fc8a8c04d4296e3d6e11ad43f684dae9dfe8282 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Installer/MediaBrowser.Installer.csproj | 2 | ||||
| -rw-r--r-- | MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index cc3ec5c2a..a69b423ac 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) { diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj index debb7163f..473e8d37a 100644 --- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj +++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj @@ -31,7 +31,7 @@ <PublisherName>Media Browser Team</PublisherName> <SuiteName>Media Browser</SuiteName> <OpenBrowserOnPublish>false</OpenBrowserOnPublish> - <ApplicationRevision>35</ApplicationRevision> + <ApplicationRevision>36</ApplicationRevision> <ApplicationVersion>0.1.1.%2a</ApplicationVersion> <UseApplicationTrust>false</UseApplicationTrust> <PublishWizardCompleted>true</PublishWizardCompleted> diff --git a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs index 3064115e3..4e2e80787 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: |