[Bug] Last.fm username not showing on Login when already logged in.

Soapwood · Jul 31, 2024 · 05ed07e · 05ed07e
1 parent 6a67939
commit 05ed07e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git 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
@@ -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
@@ -9,7 +9,7 @@
     <PackageIcon>VXLogo.png</PackageIcon>
     <ApplicationIcon>Images\VXLogoIcon.ico</ApplicationIcon>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
-    <Version>0.6.4.25</Version>
+    <Version>0.6.5.0</Version>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <Title>VXMusicDesktop</Title>
     <Authors>VirtualXtensions</Authors>