logic fixes

yfdyh000 · Apr 8, 2022 · 563fe40 · 563fe40
1 parent 393ee8c
commit 563fe40
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/PhotoSift/frmMain.cs b/PhotoSift/frmMain.cs
@@ -308,17 +308,24 @@ private void _addFile(string filePath, ref List<string> newPics, List<string> al
 					if (settings.expandFolderLnks || newPics.Count < 1)
                     {
 						var files = System.IO.Directory.EnumerateFiles(targetPath, "*", System.IO.SearchOption.AllDirectories).ToArray();
+                        foreach (var file in files)
+                        {
+							_addFiles_AddingByMIME(file, ref newPics, allowsExts);
+						}
 					}
-					return;
 				}
                 else
                 {
 					filePath = targetPath;
 					if (pics.Exists(i => i == filePath)) return;
-					ext = Path.GetExtension(filePath);
+					_addFiles_AddingByMIME(filePath, ref newPics, allowsExts);
 				}
+				return;
 			}
-
+			_addFiles_AddingByMIME(filePath, ref newPics, allowsExts);
+		}
+		private void _addFiles_AddingByMIME(string filePath, ref List<string> newPics, List<string> allowsExts) {
+			string ext = Path.GetExtension(filePath);
 			if (settings.FileMIMEChecker == FeatureSwitch.Enabled && allowsMIME.Length > 0)
 			{
 				string mime = MimeTypes.MimeTypeMap.GetMimeType(ext);