From 24e5676717a33882cb760959bb2024684bd9b73a Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 27 Sep 2014 12:42:41 -0700
Subject: [PATCH] cache error handler should handle video errors that can occur
 during removal

---
 src/Images/ImageExpand.coffee | 6 +++---
 src/Images/ImageHover.coffee  | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index ecca5d1e7..f76e30e30 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -134,16 +134,16 @@ ImageExpand =
       window.scrollBy 0, d.body.clientHeight - oldHeight
 
     if el = file.fullImage
-      delete file.fullImage
       $.off el, 'error', ImageExpand.error
+      ImageCommon.pushCache el
       if file.isVideo
         el.pause()
         for eventName, cb of ImageExpand.videoCB
           $.off el, eventName, cb
+      ImageCommon.rewind post, el
+      delete file.fullImage
       $.rm el
       $.rmClass el, 'full-image'
-      ImageCommon.rewind post, el
-      ImageCommon.pushCache el
 
   expand: (post, src) ->
     # Do not expand images of hidden/filtered replies, or already expanded pictures.
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index 9b3734a5c..e983e5b80 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -54,13 +54,12 @@ ImageHover =
       height: scale * height + padding
       noRemove: true
       cb: ->
-        if isVideo
-          el.pause()
-        $.rm el
         $.off el, 'error', error
+        ImageCommon.pushCache el
+        el.pause() if isVideo
+        $.rm el
         el.removeAttribute 'id'
         el.removeAttribute 'style'
-        ImageCommon.pushCache el
   error: (post) -> ->
     return if ImageCommon.decodeError @, post
     ImageCommon.error @, post, 3 * $.SECOND, (URL) =>