From 0a50631c0689c1797ff3368243bd681ae2780c7d Mon Sep 17 00:00:00 2001 From: AleksandrLiakhavetsEPAM <97155822+AleksandrLiakhavetsEPAM@users.noreply.github.com> Date: Sat, 17 May 2025 11:45:12 +0300 Subject: [PATCH 1/2] Avoid duplication of Repository tab --- src/ViewModels/Launcher.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs index d9425059a..a3a141c06 100644 --- a/src/ViewModels/Launcher.cs +++ b/src/ViewModels/Launcher.cs @@ -1,6 +1,6 @@ using System; using System.IO; - +using System.Linq; using Avalonia.Collections; using Avalonia.Controls; using Avalonia.Input; @@ -132,9 +132,18 @@ public void Quit(double width, double height) public void AddNewTab() { - var page = new LauncherPage(); - Pages.Add(page); - ActivePage = page; + var existingRepositoriesPAge = + Pages.FirstOrDefault(p => string.IsNullOrEmpty(p.Node.Name)); + if (existingRepositoriesPAge != null) + { + ActivePage = existingRepositoriesPAge; + } + else + { + var page = new LauncherPage(); + Pages.Add(page); + ActivePage = page; + } } public void MoveTab(LauncherPage from, LauncherPage to) From 838d2cd55fb0715d25002d8517e88d900267a882 Mon Sep 17 00:00:00 2001 From: AleksandrLiakhavetsEPAM <97155822+AleksandrLiakhavetsEPAM@users.noreply.github.com> Date: Sat, 17 May 2025 11:57:36 +0300 Subject: [PATCH 2/2] Refactoring --- src/ViewModels/Launcher.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs index a3a141c06..f41d31655 100644 --- a/src/ViewModels/Launcher.cs +++ b/src/ViewModels/Launcher.cs @@ -134,7 +134,7 @@ public void AddNewTab() { var existingRepositoriesPAge = Pages.FirstOrDefault(p => string.IsNullOrEmpty(p.Node.Name)); - if (existingRepositoriesPAge != null) + if (existingRepositoriesPAge is not null) { ActivePage = existingRepositoriesPAge; }