diff --git a/VXMusicDesktop/MVVM/View/ConnectionsView.xaml.cs b/VXMusicDesktop/MVVM/View/ConnectionsView.xaml.cs index 5a8b6b6..71e89e8 100644 --- a/VXMusicDesktop/MVVM/View/ConnectionsView.xaml.cs +++ b/VXMusicDesktop/MVVM/View/ConnectionsView.xaml.cs @@ -45,7 +45,7 @@ protected virtual void OnSpotifyLogin(object sender, EventArgs e) private void CheckLastFmConnection() { LastFmLoginButton.Content = App.VXMusicSession.ConnectionsSettings.IsLastfmConnected ? "Connected!" : "Login"; - LastFmUsernameBoxHintText.Text = App.VXMusicSession.ConnectionsSettings.IsLastfmConnected ? App.VXMusicSession.ConnectionsSettings.LastfmSettings.Username : UsernameBoxHintText; + LastFmUsernameBoxHintText.Text = App.VXMusicSession.ConnectionsSettings.IsLastfmConnected ? VXUserSettings.Connections.GetLastfmUsername() : UsernameBoxHintText; LastFmPasswordBoxHintText.Text = App.VXMusicSession.ConnectionsSettings.IsLastfmConnected ? "•••••••••••••••••••" : PasswordBoxHintText; } diff --git a/VXMusicDesktop/MVVM/ViewModel/ConnectionsViewModel.cs b/VXMusicDesktop/MVVM/ViewModel/ConnectionsViewModel.cs index b298a04..670f36c 100644 --- a/VXMusicDesktop/MVVM/ViewModel/ConnectionsViewModel.cs +++ b/VXMusicDesktop/MVVM/ViewModel/ConnectionsViewModel.cs @@ -32,8 +32,6 @@ public class ConnectionsViewModel : INotifyPropertyChanged public ICommand LinkSpotifyButtonClick => linkSpotifyButtonClick ??= new RelayCommand(PerformLinkSpotifyButtonClick); public ICommand LinkLastfmButtonClick => linkLastfmButtonClick ??= new RelayCommand(PerformLastfmLogin); - public ICommand SetSpotifyPlaylistTrackingSetting => linkLastfmButtonClick ??= new RelayCommand(PerformSetSpotifyPlaylistSaveSetting); - private bool _isLastFmConnected = false; public ConnectionsViewModel(SharedViewModel sharedViewModel) @@ -186,13 +184,6 @@ private async void PerformLastfmLogin(object commandParameter) VXMusicSession.RaiseLastFmLoggedIn(); } } - - private async void PerformSetSpotifyPlaylistSaveSetting(object commandParameter) - { - - if (String.IsNullOrEmpty(LastFmUsername) || String.IsNullOrEmpty(LastFmPassword)) - return; - } private string DetermineLastFmLinkButtonStateContent() { diff --git a/VXMusicDesktop/VXMusicDesktop.csproj b/VXMusicDesktop/VXMusicDesktop.csproj index 9aac0d2..700b4b4 100644 --- a/VXMusicDesktop/VXMusicDesktop.csproj +++ b/VXMusicDesktop/VXMusicDesktop.csproj @@ -9,7 +9,7 @@ VXLogo.png Images\VXLogoIcon.ico Always - 0.6.4.25 + 0.6.5.0 en VXMusicDesktop VirtualXtensions