From 183b5632aba26eacbbc0d103ca5127fae3da544d Mon Sep 17 00:00:00 2001 From: bcssov Date: Sat, 29 Oct 2022 22:13:13 +0200 Subject: [PATCH] Code cleanup Bump mimetypes nuget --- .../Mods/Exporter/SQLiteExporter.cs | 10 ++----- .../IronyModManager.Shared.csproj | 2 +- .../CollectionModsControlViewModel.cs | 29 +++++++++---------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/IronyModManager.IO/Mods/Exporter/SQLiteExporter.cs b/src/IronyModManager.IO/Mods/Exporter/SQLiteExporter.cs index 0e554d2b..2a76383c 100644 --- a/src/IronyModManager.IO/Mods/Exporter/SQLiteExporter.cs +++ b/src/IronyModManager.IO/Mods/Exporter/SQLiteExporter.cs @@ -696,10 +696,7 @@ static string formatPosition(int position) toInsert.Add(mapMod(item, pos)); pos++; } - if (toInsert.Count > 0) - { - await con.InsertAllAsync(toInsert, transaction: transaction, trace: trace); - } + await con.InsertAllAsync(toInsert, transaction: transaction, trace: trace); } else { @@ -788,10 +785,7 @@ Models.Paradox.v4.PlaysetsMods mapMod(Models.Paradox.v4.Mods mod, int position) toInsert.Add(mapMod(item, pos)); pos++; } - if (toInsert.Count > 0) - { - await con.InsertAllAsync(toInsert, transaction: transaction, trace: trace); - } + await con.InsertAllAsync(toInsert, transaction: transaction, trace: trace); } else { diff --git a/src/IronyModManager.Shared/IronyModManager.Shared.csproj b/src/IronyModManager.Shared/IronyModManager.Shared.csproj index 51687c65..94f142df 100644 --- a/src/IronyModManager.Shared/IronyModManager.Shared.csproj +++ b/src/IronyModManager.Shared/IronyModManager.Shared.csproj @@ -49,7 +49,7 @@ - + diff --git a/src/IronyModManager/ViewModels/Controls/CollectionModsControlViewModel.cs b/src/IronyModManager/ViewModels/Controls/CollectionModsControlViewModel.cs index 9b05cf62..4e2db5bd 100644 --- a/src/IronyModManager/ViewModels/Controls/CollectionModsControlViewModel.cs +++ b/src/IronyModManager/ViewModels/Controls/CollectionModsControlViewModel.cs @@ -4,7 +4,7 @@ // Created : 03-03-2020 // // Last Modified By : Mario -// Last Modified On : 10-28-2022 +// Last Modified On : 10-29-2022 // *********************************************************************** // // Mario @@ -2348,27 +2348,24 @@ protected virtual void SubscribeToMods() { var needsSave = false; var selectedMods = SelectedMods.ToList(); - if (selectedMods != null) + if (s.Value) { - if (s.Value) + if (!selectedMods.Contains(s.Sender)) { - if (!selectedMods.Contains(s.Sender)) + selectedMods.Add(s.Sender); + if (!string.IsNullOrWhiteSpace(SelectedModCollection?.Name)) { - selectedMods.Add(s.Sender); - if (!string.IsNullOrWhiteSpace(SelectedModCollection?.Name)) - { - SaveState(); - } - needsSave = true; + SaveState(); } + needsSave = true; } - else + } + else + { + if (selectedMods.Contains(s.Sender)) { - if (selectedMods.Contains(s.Sender)) - { - selectedMods.Remove(s.Sender); - needsSave = true; - } + selectedMods.Remove(s.Sender); + needsSave = true; } } if (!string.IsNullOrWhiteSpace(SelectedModCollection?.Name) && needsSave)