[Bugfix] A smartlist could be set as the source of another list refer…

…encing itself.

Happens when changing source, if the previous one was already cached. Will remove all reference to a list in the recursion cache when changing the source.

ComicRack.Engine/ComicRack.Engine.csproj

@@ -64,6 +64,7 @@
     <Compile Include="BookPageRetrievalCompletedEventArgs.cs" />
     <Compile Include="CacheManager.cs" />
     <Compile Include="ComicBook.cs" />
+    <Compile Include="Database\RecursionCache.cs" />
     <Compile Include="IO\Provider\Pdfium.cs" />
     <Compile Include="IO\Provider\Readers\Pdf\PdfiumReaderEngine.cs" />
     <Compile Include="Metadata\ComicBook\Comparer\ComicBookAddedComparer.cs" />

ComicRack.Engine/Database/ComicListItem.cs

@@ -816,41 +816,4 @@ public ComicBookSeriesStatistics GetSeriesStats(ComicBook book)
 			}
 		}
 	}
-
-	public class RecursionCache: Dictionary<Guid, RecursionCacheItem>
-	{
-        private static Lazy<RecursionCache> instance = new Lazy<RecursionCache>(() => new RecursionCache());
-
-        public static RecursionCache Items => instance.Value;
-
-        private RecursionCache() : base()
-        {
-
-        }
-
-		public RecursionCacheItem GetValue(Guid guid)
-		{
-			if (Items.TryGetValue(guid, out RecursionCacheItem cachedResult))
-			{
-				return cachedResult;
-			}
-
-			RecursionCacheItem item = RecursionCacheItem.Empty();
-			this[guid] = item;
-			return item;
-		}
-	}
-
-	public class RecursionCacheItem : Dictionary<Guid, bool>
-	{
-        private RecursionCacheItem() : base()
-        {
-
-        }
-
-        public static RecursionCacheItem Empty()
-        {
-            return new RecursionCacheItem();
-        }
-    }
 }

ComicRack.Engine/Database/RecursionCache.cs

@@ -0,0 +1,52 @@
+using cYo.Common.Collections;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace cYo.Projects.ComicRack.Engine.Database
+{
+    public class RecursionCache: Dictionary<Guid, RecursionCacheItem>
+	{
+        private static Lazy<RecursionCache> instance = new Lazy<RecursionCache>(() => new RecursionCache());
+
+        public static RecursionCache Items => instance.Value;
+
+        private RecursionCache() : base()
+        {
+
+        }
+
+		public RecursionCacheItem GetValue(Guid guid)
+		{
+			if (Items.TryGetValue(guid, out RecursionCacheItem cachedResult))
+			{
+				return cachedResult;
+			}
+
+			RecursionCacheItem item = RecursionCacheItem.Empty();
+			this[guid] = item;
+			return item;
+		}
+
+        public void RemoveReference(Guid guid)
+        {
+            //Remove all the cache for this list
+            Items.Remove(guid);
+            //And all it's reference
+            Items.Where(cacheItem => cacheItem.Value.ContainsKey(guid)).SafeForEach(x => x.Value.Remove(guid));
+        }
+    }
+
+    public class RecursionCacheItem : Dictionary<Guid, bool>
+    {
+        private RecursionCacheItem() : base()
+        {
+
+        }
+
+        public static RecursionCacheItem Empty()
+        {
+            return new RecursionCacheItem();
+        }
+    }
+}

ComicRack/ComicRack.csproj

@@ -890,7 +890,7 @@ del /Q *.pdb
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-  <Target Name = "Clean">
+  <Target Name="Clean">
     <RemoveDir Directories="$(TargetDir)\Resources\Icons" />
   </Target>
   <Target Name="AfterBuild">

ComicRack/Views/ComicListLibraryBrowser.cs

@@ -586,6 +586,10 @@ private bool EditSmartListItem(TreeNode tn, ComicSmartListItem csli)
 					sld.Apply += delegate
 					{
 						csli.SetList(sld.SmartComicList);
+
+						//Remove recursionCache if we changed the source
+						if (csli.BaseListId != oldList.BaseListId)
+							RecursionCache.Items.RemoveReference(csli.Id);
 					};
 					sld.Next += delegate
 					{
@@ -1110,7 +1114,7 @@ private void tvQueries_DragDrop(object sender, DragEventArgs e)
 				}
 				ComicListItemCollection comicListItemCollection = ((dragNode.Parent == null) ? Library.ComicLists : ((ComicListItemFolder)dragNode.Parent.Tag).Items);
 				ComicListItem comicListItem = dragNode.Tag as ComicListItem;
-                RecursionCache.Items.Remove(comicListItem.Id);
+                RecursionCache.Items.RemoveReference(comicListItem.Id);
                 if (e.Effect == DragDropEffects.Copy && comicListItem is ShareableComicListItem)
 				{
 					comicListItem = ((ICloneable)(ShareableComicListItem)comicListItem).Clone<ShareableComicListItem>();