aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication/ApplicationHost.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-29 15:59:52 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-29 15:59:52 -0400
commit1a5a75854bd3ec4cdd771c9afdaefe0acb62c03c (patch)
tree1479a46b06ca7e3a22f4c1646e6a65aa533e2f33 /MediaBrowser.ServerApplication/ApplicationHost.cs
parentb87f759460490792b7ceaf0513ab0d87a869e73b (diff)
update translations
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs18
1 files changed, 13 insertions, 5 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 8007e0506..470786ba2 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -41,7 +41,6 @@ using MediaBrowser.Dlna.Main;
using MediaBrowser.MediaEncoding.BdInfo;
using MediaBrowser.MediaEncoding.Encoder;
using MediaBrowser.MediaEncoding.Subtitles;
-using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.System;
@@ -288,17 +287,24 @@ namespace MediaBrowser.ServerApplication
private void MigrateModularConfigurations()
{
+ var saveConfig = false;
+
if (ServerConfigurationManager.Configuration.DlnaOptions != null)
{
ServerConfigurationManager.SaveConfiguration("dlna", ServerConfigurationManager.Configuration.DlnaOptions);
ServerConfigurationManager.Configuration.DlnaOptions = null;
- ServerConfigurationManager.SaveConfiguration();
+ saveConfig = true;
}
if (ServerConfigurationManager.Configuration.ChapterOptions != null)
{
ServerConfigurationManager.SaveConfiguration("chapters", ServerConfigurationManager.Configuration.ChapterOptions);
ServerConfigurationManager.Configuration.ChapterOptions = null;
+ saveConfig = true;
+ }
+
+ if (saveConfig)
+ {
ServerConfigurationManager.SaveConfiguration();
}
}
@@ -1088,10 +1094,12 @@ namespace MediaBrowser.ServerApplication
var version = InstallationManager.GetLatestCompatibleVersion(availablePackages, "MBServer", null, ApplicationVersion,
ConfigurationManager.CommonConfiguration.SystemUpdateLevel);
- HasUpdateAvailable = version != null && version.version >= ApplicationVersion;
+ var versionObject = version == null || string.IsNullOrWhiteSpace(version.versionStr) ? null : new Version(version.versionStr);
+
+ HasUpdateAvailable = versionObject != null && versionObject >= ApplicationVersion;
- return version != null ? new CheckForUpdateResult { AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version } :
- new CheckForUpdateResult { AvailableVersion = ApplicationVersion, IsUpdateAvailable = false };
+ return versionObject != null ? new CheckForUpdateResult { AvailableVersion = versionObject.ToString(), IsUpdateAvailable = versionObject > ApplicationVersion, Package = version } :
+ new CheckForUpdateResult { AvailableVersion = ApplicationVersion.ToString(), IsUpdateAvailable = false };
}
/// <summary>