From 4e509d92cb9565ae88df608f3ef7da5fcd98904d Mon Sep 17 00:00:00 2001
From: WMJ <wmj@live.cn>
Date: Tue, 19 Jul 2022 10:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=8B=E5=90=88=E5=B9=B6=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=E6=B7=BB=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E6=97=B6=E4=B8=8D=E5=AF=BC=E5=85=A5=E5=AD=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E7=9A=84=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Model/SourceItem.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/App/Model/SourceItem.cs b/App/Model/SourceItem.cs
index 2627b92..628c62d 100644
--- a/App/Model/SourceItem.cs
+++ b/App/Model/SourceItem.cs
@@ -347,12 +347,17 @@ namespace PDFPatcher.Model
 
 				var p = FilePath.ToString();
 				var l = Items;
-				if (AppContext.Merger.SubFolderBeforeFiles) {
-					AddSubDirectories(p, l);
-					AddFiles(p, l);
-				}
-				else {
-					AddSubDirectoriesAndFiles(p, l);
+				switch (AppContext.Merger.SubFolder) {
+					case MergerOptions.SubFolderPosition.BeforeFiles:
+						AddSubDirectories(p, l);
+						AddFiles(p, l);
+						break;
+					case MergerOptions.SubFolderPosition.WithFiles:
+						AddSubDirectoriesAndFiles(p, l);
+						break;
+					case MergerOptions.SubFolderPosition.Exclude:
+						AddFiles(p, l);
+						break;
 				}
 			}