Merge pull request #25239 from davidflanagan/bug1062114

Bug 1062114: double-check that we're still hidden before exiting r=pdahiya
mozilla-b2g · Oct 21, 2014 · 3d7d592 · 3d7d592
2 parents 4d7f051 + 995591d
commit 3d7d592
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/apps/gallery/js/gallery.js b/apps/gallery/js/gallery.js
@@ -1429,7 +1429,14 @@ function doNotScanInBackgroundHack(photodb) {
       // wait a bit for the log to be flushed, and then close the application
       if (document.hidden && photodb.scanning) {
         console.warn('[Gallery] exiting to avoid background scan.');
-        setTimeout(function() { window.close(); }, 500);
+        setTimeout(function() {
+          if (document.hidden) {
+            window.close();
+          }
+          else {
+            console.warn('[Gallery] now visible again, so not exiting');
+          }
+        }, 500);
       }
     }
   }