Fix: Treat mapId=0 as invalid mapid, so search can fallback to other …

…search methods (by default MSN)
Piotrekol · Sep 11, 2018 · 24fc506 · 24fc506
1 parent 8ae6a95
commit 24fc506
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/osu!StreamCompanion/Code/Core/Maps/Processing/MapStringFormatter.cs b/osu!StreamCompanion/Code/Core/Maps/Processing/MapStringFormatter.cs
@@ -84,15 +84,22 @@ public void ConsumerTask()
                         //Here we prioritize Memory events over MSN/other.
                         if (TasksMemory.TryPop(out searchArgs))
                         {
-                            searchResult = _mainMapDataGetter.FindMapData(searchArgs);
-                            if (searchResult.FoundBeatmaps)
+                            if (searchArgs.MapId == 0)
                             {
-                                memorySearchFailed = false;
-                                searchResult.EventSource = searchArgs.SourceName;
-                                _mainMapDataGetter.ProcessMapResult(searchResult);
+                                memorySearchFailed = true;
                             }
                             else
-                                memorySearchFailed = true;
+                            {
+                                searchResult = _mainMapDataGetter.FindMapData(searchArgs);
+                                if (searchResult.FoundBeatmaps)
+                                {
+                                    memorySearchFailed = false;
+                                    searchResult.EventSource = searchArgs.SourceName;
+                                    _mainMapDataGetter.ProcessMapResult(searchResult);
+                                }
+                                else
+                                    memorySearchFailed = true;
+                            }
                         }
                         if (memorySearchFailed)
                         {

diff --git a/plugins/OsuMemoryEventSource/OsuMemoryEventSource.cs b/plugins/OsuMemoryEventSource/OsuMemoryEventSource.cs
@@ -73,6 +73,12 @@ public MapSearchResult FindBeatmap(MapSearchArgs searchArgs)
                 return result;
             }
 
+            if (mapId == 0)
+            {
+                Logger?.Log("Map has no ID", LogLevel.Advanced);
+                return result;
+            }
+
             var b = _sqLiteController.GetBeatmap(mapId);
             if (b != null)
             {