Merge pull request #102 from VPKSoft/fix_albumComboUpdate

Add album Combo box refresh.
VPKSoft · Aug 21, 2022 · 3d9c8af · 3d9c8af
2 parents c6ff588 + b661ad5
commit 3d9c8af
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/amp.EtoForms/FormMain.Events.cs b/amp.EtoForms/FormMain.Events.cs
@@ -46,6 +46,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using EtoForms.Controls.Custom.UserIdle;
 using EtoForms.Controls.Custom.Utilities;
 using Microsoft.EntityFrameworkCore;
+using Album = amp.EtoForms.DtoClasses.Album;
 using AlbumTrack = amp.EtoForms.DtoClasses.AlbumTrack;
 using AudioTrack = amp.EtoForms.DtoClasses.AudioTrack;
 
@@ -534,14 +535,35 @@ await Globals.LoggerSafeInvokeAsync(async () =>
 
     private async void ManageAlbumsCommand_Executed(object? sender, EventArgs e)
     {
+        using var form = new FormAlbums(context);
+
+        bool changed;
+
         if (UtilityOS.IsMacOS)
         {
             // ReSharper disable once MethodHasAsyncOverload, Shown-event won't fire on macOS.
-            new FormAlbums(context).ShowModal(this);
+            changed = form.ShowModal(this);
         }
         else
         {
-            await new FormAlbums(context).ShowModalAsync(this);
+            changed = await form.ShowModalAsync(this);
+        }
+
+        if (changed)
+        {
+            suspendAlbumChange = true;
+            albums = context.Albums.Select(f => Globals.AutoMapper.Map<Album>(f)).ToList();
+            cmbAlbumSelect.DataStore = albums;
+            var index = albums.FindIndex(f => f.Id == CurrentAlbumId);
+            if (index == -1)
+            {
+                CurrentAlbumId = 1;
+            }
+            else
+            {
+                cmbAlbumSelect.SelectedIndex = index;
+            }
+            suspendAlbumChange = false;
         }
     }