git-pulled, but had to manuall fix some conflicts.

1 files changed, 7 insertions, 0 deletions

diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 3b173928..d56edabb 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -84,6 +84,13 @@ class gallery_task_Core {
       $ignored = $task->get("ignored", array());
 
       $i = 0;
+
+      // If there's no work left to do, skip to the end.  This can happen if we resume a task long
+      // after the work got done in some other task.
+      if (!$result->count()) {
+        $completed = $total_count;
+      }
+
       foreach ($result as $row) {
         if (array_key_exists($row->id, $ignored)) {
           continue;