From 99fae2ec6e180dbefb6e8c048e83e9e6b7a2371b Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sat, 4 Dec 2021 21:38:48 -0500
Subject: [PATCH] pad: Fix application of `padOptions` values from
 `settings.json`

---
 CHANGELOG.md         | 6 ++++++
 src/static/js/pad.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ed2d637c..7b9efcb01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ### Notable enhancements and fixes
 
+* The following settings from `settings.json` are now applied as expected (they
+  were unintentionally ignored before):
+  * `padOptions.lang`
+  * `padOptions.showChat`
+  * `padOptions.userColor`
+  * `padOptions.userName`
 * Fixed a potential attribute pool corruption bug with `copyPadWithoutHistory`.
 * Mappings created by the `createGroupIfNotExistsFor` HTTP API are now removed
   from the database when the group is deleted.
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index bba8008f2..1696acc56 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -148,7 +148,7 @@ const getParams = () => {
     let value = clientVars.padOptions[setting.name];
     if (value == null) continue;
     value = value.toString();
-    if (value === setting.checkVal) {
+    if (value === setting.checkVal || setting.checkVal == null) {
       setting.callback(value);
     }
   }