From b16fb5da7fb344bf36afa7c21f3b794ee07318f6 Mon Sep 17 00:00:00 2001
From: Felanbird <41973452+Felanbird@users.noreply.github.com>
Date: Fri, 22 Oct 2021 08:08:58 -0400
Subject: [PATCH] Fix 'First Message' custom sound not persisting through
 restart (#3303)

---
 CHANGELOG.md                                  | 1 +
 src/controllers/highlights/HighlightModel.cpp | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e01abe26a..68ec792e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - Bugfix: Fixed built-in Chatterino commands not working in whispers and mentions special channels (#3288)
 - Bugfix: Fixed `QCharRef with an index pointing outside the valid range of a QString` warning that was emitted on every Tab press. (#3234)
 - Bugfix: Fixed being unable to disable `First Message` highlights (#3293)
+- Bugfix: Fixed `First Message` custom sound not persisting through restart. (#3303)
 - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103)
 - Dev: Add benchmarks that can be compiled with the `BUILD_BENCHMARKS` CMake flag. Off by default. (#3038)
 
diff --git a/src/controllers/highlights/HighlightModel.cpp b/src/controllers/highlights/HighlightModel.cpp
index 780918d36..a1bcb93e7 100644
--- a/src/controllers/highlights/HighlightModel.cpp
+++ b/src/controllers/highlights/HighlightModel.cpp
@@ -306,6 +306,11 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
                     getSettings()->redeemedHighlightSoundUrl.setValue(
                         value.toString());
                 }
+                else if (rowIndex == 4)
+                {
+                    getSettings()->firstMessageHighlightSoundUrl.setValue(
+                        value.toString());
+                }
             }
         }
         break;