Fix "no results" shown when starting new search while searching

johnfactotum · May 12, 2023 · f386780 · f386780
1 parent 9b0a5bf
commit f386780
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/foliate-js b/src/foliate-js
diff --git a/src/search.js b/src/search.js
@@ -109,7 +109,11 @@ GObject.registerClass({
         this.generator = await this.getGenerator({ ...opts, query, index })
 
         for await (const result of this.generator) {
-            if ('progress' in result)
+            if (result === 'done') {
+                this.entry.progress_fraction = null
+                if (!this.model.model.get_n_items()) this.emit('no-results')
+            }
+            else if ('progress' in result)
                 this.entry.progress_fraction = result.progress
             else {
                 const { label, cfi, excerpt, subitems } = result
@@ -125,8 +129,6 @@ GObject.registerClass({
                 }) : new SearchResult({ label: formatExcerpt(excerpt), cfi }))
             }
         }
-        this.entry.progress_fraction = null
-        if (!this.model.model.get_n_items()) this.emit('no-results')
     }
     cycle(dir) {
         const { model } = this