fix: when a deactivated package is installed in a specific version (n…

…ot as placeholder), selecting a branch where the package is available would by default install as placeholder (cherry picked from commit c517951)
Zeugwerk · Jul 24, 2024 · 3a737fd · 3a737fd
1 parent 6a9ee31
commit 3a737fd
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/TwinpackVsixShared/Dialogs/CatalogWindow.xaml.cs b/TwinpackVsixShared/Dialogs/CatalogWindow.xaml.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using Microsoft.VisualStudio.PlatformUI;
 using Microsoft.VisualStudio.Threading;
 using NLog;
 using TCatSysManagerLib;
@@ -1237,7 +1238,7 @@ private async Task LoadNextPackageVersionsPageAsync(bool reset = false, Cancella
                         new PlcVersion
                         {
                             Version = null,
-                            VersionDisplayText = "Latest " + (results?.Item1?.Any() == true ? "(" + results.Item1.First().Version + ")" : "" )
+                            VersionDisplayText = "Latest"
                         }
                     };
 
@@ -1533,21 +1534,20 @@ private async void PackageFilter_SelectionChanged(object sender, SelectionChange
 
                 if(Versions?.Any(x => x.Version != null) == true)
                 {
-
                     var index = Versions?.FindIndex(x => x.Version == _catalogItem?.Installed?.Version) ?? -1;
-                    if (_catalogItem?.IsPlaceholder == true || (index < 0 && _catalogItem?.Installed != null))
+                    if (_catalogItem?.IsPlaceholder == true)
                         index = 0;
+                    else if (index < 0 && _catalogItem?.Installed != null)
+                        index = Versions.Count > 1 ? 1 : 0;
 
                     VersionsView.IsEnabled = true;
-                    VersionsView.SelectedIndex = string.IsNullOrEmpty(_catalogItem?.Installed?.Version) ? 1 : index;
+                    VersionsView.SelectedIndex = index;
                 }
                 else
                 {
                     VersionsView.IsEnabled = false;
                     VersionsView.SelectedIndex = -1;
                 }
-
-
             }
             catch (OperationCanceledException ex)
             {