cleaned up logic for retrieveOrEnroll

Josh Klontz
1 parent e8c22427
Showing 1 changed file with 11 additions and 4 deletions
sdk/core/core.cpp
@@ -174,12 +174,19 @@ struct AlgorithmCore
  
     void retrieveOrEnroll(const File &file, QScopedPointer<Gallery> &gallery, FileList &galleryFiles)
     {
-        gallery.reset(Gallery::make(file));
-        if ((file.suffix() != "gal") && (file.suffix() != "mem")) {
-            enroll(file);
-            gallery.reset(Gallery::make(getMemoryGallery(file)));
+        if ((file.suffix() == "gal") || (file.suffix() == "mem")) {
+            // Retrieve it
+            gallery.reset(Gallery::make(file));
             galleryFiles = gallery->files();
         } else {
+            // Was it already enrolled in memory?
+            gallery.reset(Gallery::make(getMemoryGallery(file)));
+            galleryFiles = gallery->files();
+            if (!galleryFiles.isEmpty()) return;
+
+            // Enroll it
+            enroll(file);
+            gallery.reset(Gallery::make(getMemoryGallery(file)));
             galleryFiles = gallery->files();
         }
     }