From af21becff600c8d8d2307d3a5a68ea229c1a26b4 Mon Sep 17 00:00:00 2001
From: Mayhem <stepien.nicolas@gmail.com>
Date: Mon, 25 Nov 2013 13:21:37 +0100
Subject: [PATCH] Fix #1347.

---
 CHANGELOG.md          |  3 +++
 src/Posting/QR.coffee | 16 ++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d10d6cb3b..bf858f7d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+- Minor cooldown fix:
+ - You cannot post an image reply immediately after a non-image reply anymore.
+
 ## 3.14.0 - *2013-11-21*
 
 - **New option**: `Auto-hide header on scroll`.
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 7f850868b..698d1bf8a 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -262,11 +262,11 @@ QR =
       if delay
         cooldown = {delay}
       else
-        if hasFile = !!post.file
+        if post.file
           upSpd = post.file.size / ((start - req.uploadStartTime) / $.SECOND)
           QR.cooldown.upSpdAccuracy = ((upSpd > QR.cooldown.upSpd * .9) + QR.cooldown.upSpdAccuracy) / 2
           QR.cooldown.upSpd = upSpd
-        cooldown = {isReply, hasFile, threadID}
+        cooldown = {isReply, threadID}
       QR.cooldown.cooldowns[start] = cooldown
       $.set "cooldown.#{g.BOARD}", QR.cooldown.cooldowns
       QR.cooldown.start()
@@ -308,16 +308,12 @@ QR =
           #   reply cooldown with a reply, thread cooldown with a thread
           elapsed = Math.floor (now - start) / $.SECOND
           continue if elapsed < 0 # clock changed since then?
-          unless isReply
-            type = 'thread'
+          type = unless isReply
+            'thread'
           else if hasFile
-            # You can post an image reply immediately after a non-image reply.
-            unless cooldown.hasFile
-              seconds = Math.max seconds, 0
-              continue
-            type = 'image'
+            'image'
           else
-            type = 'reply'
+            'reply'
           maxTimer = Math.max types[type] or 0, types[type + '_intra'] or 0
           unless start <= now <= start + maxTimer * $.SECOND
             QR.cooldown.unset start