diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8eaade5b..b41acc890 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.9
+**v1.11.9.2** *(2015-08-16)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.2/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.11.8.9: Fix regression from v1.11.8.0 that caused the cooldown to stop working in certain circumstances.
+
**v1.11.9.1** *(2015-08-16)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.1/builds/4chan-X-noupdate.crx "Chromium version")]
- Add more info and a reporting link to error messages.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 791708d25..447250849 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index edb53bab2..981fc5e6a 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.11.9.1
+// @version 1.11.9.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 18e85de7b..257742e1f 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X beta
-// @version 1.11.9.1
+// @version 1.11.9.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -412,7 +412,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.9.1',
+ VERSION: '1.11.9.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -8960,12 +8960,13 @@
QR.cooldown.maxDelay = Math.max(QR.cooldown.maxDelay, delay);
}
}
+ QR.cooldown.isSetup = true;
return QR.cooldown.start();
},
start: function() {
var data;
data = QR.cooldown.data;
- if (!(QR.cooldown.delays && !QR.cooldown.isCounting && Object.keys(data[g.BOARD.ID] || {}).length + Object.keys(data.global || {}).length > 0)) {
+ if (!(QR.cooldown.isSetup && !QR.cooldown.isCounting && Object.keys(data[g.BOARD.ID] || {}).length + Object.keys(data.global || {}).length > 0)) {
return;
}
QR.cooldown.isCounting = true;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index dfef53718..dd5584d49 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index 5c39f10e6..a5609951c 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
-// @version 1.11.9.1
+// @version 1.11.9.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -411,7 +411,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.9.1',
+ VERSION: '1.11.9.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -8959,12 +8959,13 @@
QR.cooldown.maxDelay = Math.max(QR.cooldown.maxDelay, delay);
}
}
+ QR.cooldown.isSetup = true;
return QR.cooldown.start();
},
start: function() {
var data;
data = QR.cooldown.data;
- if (!(QR.cooldown.delays && !QR.cooldown.isCounting && Object.keys(data[g.BOARD.ID] || {}).length + Object.keys(data.global || {}).length > 0)) {
+ if (!(QR.cooldown.isSetup && !QR.cooldown.isCounting && Object.keys(data[g.BOARD.ID] || {}).length + Object.keys(data.global || {}).length > 0)) {
return;
}
QR.cooldown.isCounting = true;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index f4eb487f3..d2ddf59a7 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index bf6c7bce7..d22715a88 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.11.9.1
+// @version 1.11.9.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index ff1c0e9af..b8b14fbaa 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
-// @version 1.11.9.1
+// @version 1.11.9.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -412,7 +412,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.9.1',
+ VERSION: '1.11.9.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -8960,12 +8960,13 @@
QR.cooldown.maxDelay = Math.max(QR.cooldown.maxDelay, delay);
}
}
+ QR.cooldown.isSetup = true;
return QR.cooldown.start();
},
start: function() {
var data;
data = QR.cooldown.data;
- if (!(QR.cooldown.delays && !QR.cooldown.isCounting && Object.keys(data[g.BOARD.ID] || {}).length + Object.keys(data.global || {}).length > 0)) {
+ if (!(QR.cooldown.isSetup && !QR.cooldown.isCounting && Object.keys(data[g.BOARD.ID] || {}).length + Object.keys(data.global || {}).length > 0)) {
return;
}
QR.cooldown.isCounting = true;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 7ed93aa4b..7cab7db0e 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 82b44f9ca..5b59db41f 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.xml b/builds/updates.xml
index 3fbd64fd4..34a7d1cb0 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 906c8a1fc..9f8e7f2ec 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
"meta": {
"name": "4chan X",
"fork": "ccd0",
- "version": "1.11.9.1",
- "date": "2015-08-16T10:52:53.645Z",
+ "version": "1.11.9.2",
+ "date": "2015-08-17T01:13:28.335Z",
"page": "https://www.4chan-x.net/",
"downloads": "https://www.4chan-x.net/builds/",
"oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",