fix thecodrr#226

vp007-dev · Dec 19, 2017 · 225848e · 225848e
1 parent 4261171
commit 225848e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/BreadPlayer.Common/Messenger/MessageTypes.cs b/BreadPlayer.Common/Messenger/MessageTypes.cs
@@ -17,7 +17,8 @@ public enum MessageTypes
         MsgStopAfterSong,
         MsgImportFolder,
         MsgNavigate,
-        MsgSearch
+        MsgSearch,
+        MsgChangePlaylist
         //MSG_CUSTOMER_SAVED				// Sent when a Customer is updated to the repository
     }
 }
diff --git a/BreadPlayer.Extensions/ThreadSafeObservableCollection.cs b/BreadPlayer.Extensions/ThreadSafeObservableCollection.cs
@@ -310,7 +310,7 @@ private TResult SafeEnterWriteLock<TResult>(Func<TResult> action)
     }
     private TResult SafeEnterReadLock<TResult>(Func<TResult> action)
     {
-        if (!Sync.IsReadLockHeld)
+        if (!Sync.IsReadLockHeld && !Sync.IsWriteLockHeld)
         {
             Sync.EnterReadLock();
         }

diff --git a/BreadPlayer.Views.UWP/Shell.xaml b/BreadPlayer.Views.UWP/Shell.xaml
@@ -50,7 +50,7 @@
         <BPControls:ImageEx
             x:Name="MainBackgroundImage"
             Margin="0,0,0,70"
-            Source="{Binding Source={StaticResource Core}, Path=Instance.Player.CurrentlyPlayingFile.AttachedPicture, Converter={StaticResource PathToImage}, ConverterParameter='null'}"
+            Source="{Binding Source={StaticResource Core}, Path=Instance.Player.CurrentlyPlayingFile.AttachedPicture}"
             Stretch="UniformToFill">
             <Image
                 x:Name="backgroundImage"

diff --git a/BreadPlayer.Views.UWP/Shell.xaml.cs b/BreadPlayer.Views.UWP/Shell.xaml.cs
@@ -100,6 +100,10 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
                     }
                     NowPlayingFrame.Navigate(payload.pageType, payload.parameter, new Windows.UI.Xaml.Media.Animation.SlideNavigationTransitionInfo());
                 }
+                else if(payload.pageType == typeof(PlaylistView))
+                {
+                    NowPlayingFrame.Navigate(payload.pageType, payload.parameter, new Windows.UI.Xaml.Media.Animation.SlideNavigationTransitionInfo());
+                }
                 if (ApiInformation.IsTypePresent("Windows.Phone.UI.Input.HardwareButtons"))
                 {
                     Windows.Phone.UI.Input.HardwareButtons.BackPressed += BackButtonPressed;

diff --git a/BreadPlayer.Views.UWP/ViewModels/AlbumArtistViewModel.cs b/BreadPlayer.Views.UWP/ViewModels/AlbumArtistViewModel.cs
@@ -131,8 +131,8 @@ await Task.Run(() =>
                 }
             }).ContinueWith(async (task) =>
             {
-                await AlbumArtistService.InsertAlbums(albums).ConfigureAwait(false);
-                await AlbumArtistService.InsertArtists(artists).ConfigureAwait(false);
+                await AlbumArtistService.InsertAlbums(albums);
+                await AlbumArtistService.InsertArtists(artists);
                 ArtistsCollection.CollectionChanged += ArtistsCollection_CollectionChanged;
             });
         }