From a7c31d60869438975124fe41ccfad4a24d56d7d7 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Sun, 26 Feb 2023 16:30:08 +0100 Subject: [PATCH] revertsadfasdf --- ModpackUpdater/AppConfig.vb | 3 +-- ModpackUpdater/UpdateInstaller.vb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ModpackUpdater/AppConfig.vb b/ModpackUpdater/AppConfig.vb index 213865f..fabe493 100644 --- a/ModpackUpdater/AppConfig.vb +++ b/ModpackUpdater/AppConfig.vb @@ -9,12 +9,11 @@ Public Class AppConfig Public Property LastConfigFilePath As String Public Property KeepLocalFiles As New List(Of String) Public Property RemoveLocalFiles As Boolean - Public Property OnlySearchSubfolders As Boolean Public Sub Reset() KeepLocalFiles.Clear() KeepLocalFiles.Add("OptiFine_1.7.10_HD_U_E7.jar") - OnlySearchSubfolders = True + RemoveLocalFiles = False End Sub Public Shared ReadOnly Property Instance As AppConfig diff --git a/ModpackUpdater/UpdateInstaller.vb b/ModpackUpdater/UpdateInstaller.vb index fe0c557..74d57da 100644 --- a/ModpackUpdater/UpdateInstaller.vb +++ b/ModpackUpdater/UpdateInstaller.vb @@ -89,7 +89,6 @@ Public Class UpdateInstaller Dim allLocalFiles = Directory.GetFiles(localPath, "*", SearchOption.AllDirectories) For Each lf As String In allLocalFiles Dim isKnown As Boolean = False - Dim allowRemove As Boolean = AppConfig.Instance.OnlySearchSubfolders OrElse Path.GetDirectoryName(lf) <> localPath For Each checkedFile As String In checkedFiles If Not isKnown AndAlso If(checkedFile, "") = If(lf, "") Then @@ -97,7 +96,7 @@ Public Class UpdateInstaller End If Next - If Not isKnown AndAlso allowRemove Then + If Not isKnown Then result.SyncFiles.Add(New UpdateSyncFile(If(ignoreRevmoedFiles, UpdateSyncAction.None, UpdateSyncAction.RemovedFile), lf, String.Empty)) End If Next