diff --git a/IntegrationTests/IntegrationTests.csproj b/IntegrationTests/IntegrationTests.csproj index e55659b1e..e563e362c 100644 --- a/IntegrationTests/IntegrationTests.csproj +++ b/IntegrationTests/IntegrationTests.csproj @@ -67,8 +67,8 @@ - - ..\packages\System.Data.SQLite.Core.1.0.111.0\lib\net46\System.Data.SQLite.dll + + ..\packages\System.Data.SQLite.Core.1.0.112.1\lib\net40\System.Data.SQLite.dll @@ -136,8 +136,8 @@ - + - + \ No newline at end of file diff --git a/IntegrationTests/packages.config b/IntegrationTests/packages.config index 017ab1e5b..3146470b7 100644 --- a/IntegrationTests/packages.config +++ b/IntegrationTests/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/OnlyM.Core/OnlyM.Core.csproj b/OnlyM.Core/OnlyM.Core.csproj index 0187240ca..8f4439ee8 100644 --- a/OnlyM.Core/OnlyM.Core.csproj +++ b/OnlyM.Core/OnlyM.Core.csproj @@ -105,8 +105,8 @@ - - ..\packages\System.Data.SQLite.Core.1.0.111.0\lib\net46\System.Data.SQLite.dll + + ..\packages\System.Data.SQLite.Core.1.0.112.1\lib\net40\System.Data.SQLite.dll @@ -264,11 +264,11 @@ copy "$(ProjectDir)Properties\Resources.no-NO.resx" "$(ProjectDir)Properties\Resources.no.resx" copy "$(ProjectDir)Properties\Resources.pap-PAP.resx" "$(ProjectDir)Properties\Resources.pap.resx" - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/OnlyM.Core/packages.config b/OnlyM.Core/packages.config index 85f72bed9..d53ab94a0 100644 --- a/OnlyM.Core/packages.config +++ b/OnlyM.Core/packages.config @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/OnlyM.ruleset b/OnlyM.ruleset index 4dcd36d6a..2e3706b48 100644 --- a/OnlyM.ruleset +++ b/OnlyM.ruleset @@ -64,6 +64,10 @@ + + + + diff --git a/OnlyM/OnlyM.csproj b/OnlyM/OnlyM.csproj index 061c22550..9fe14cdd8 100644 --- a/OnlyM/OnlyM.csproj +++ b/OnlyM/OnlyM.csproj @@ -149,8 +149,8 @@ - - ..\packages\System.Data.SQLite.Core.1.0.111.0\lib\net46\System.Data.SQLite.dll + + ..\packages\System.Data.SQLite.Core.1.0.112.1\lib\net40\System.Data.SQLite.dll @@ -468,7 +468,7 @@ - + copy "$(ProjectDir)Properties\Resources.no-NO.resx" "$(ProjectDir)Properties\Resources.no.resx" @@ -476,5 +476,5 @@ copy "$(ProjectDir)Properties\Resources.pap-PAP.resx" "$(ProjectDir)Properties\R - + \ No newline at end of file diff --git a/OnlyM/Services/MetaDataQueue/MetaDataQueueConsumer.cs b/OnlyM/Services/MetaDataQueue/MetaDataQueueConsumer.cs index 403e84acb..a23a87b1a 100644 --- a/OnlyM/Services/MetaDataQueue/MetaDataQueueConsumer.cs +++ b/OnlyM/Services/MetaDataQueue/MetaDataQueueConsumer.cs @@ -214,12 +214,9 @@ private void PopulateThumbnail(MediaItem mediaItem) private string GetMediaTitle(string filePath, MediaMetaData metaData) { - if (_optionsService.UseInternalMediaTitles && metaData != null) + if (_optionsService.UseInternalMediaTitles && metaData != null && !string.IsNullOrEmpty(metaData.Title)) { - if (!string.IsNullOrEmpty(metaData.Title)) - { - return metaData.Title; - } + return metaData.Title; } return Path.GetFileNameWithoutExtension(filePath); diff --git a/OnlyM/ViewModel/MediaViewModel.cs b/OnlyM/ViewModel/MediaViewModel.cs index 3e56700eb..517104c05 100644 --- a/OnlyM/ViewModel/MediaViewModel.cs +++ b/OnlyM/ViewModel/MediaViewModel.cs @@ -288,6 +288,10 @@ private double CalculateMagnifierRadius() switch (_optionsService.MagnifierSize) { + default: + case MagnifierSize.Medium: + return delta * 6; + case MagnifierSize.XXSmall: return delta; @@ -297,10 +301,6 @@ private double CalculateMagnifierRadius() case MagnifierSize.Small: return delta * 4; - default: - case MagnifierSize.Medium: - return delta * 6; - case MagnifierSize.Large: return delta * 8; diff --git a/OnlyM/packages.config b/OnlyM/packages.config index ec56ea303..789da7e7c 100644 --- a/OnlyM/packages.config +++ b/OnlyM/packages.config @@ -22,7 +22,7 @@ - + \ No newline at end of file