From 3e5a0be7d8548566fac88054b04298ff59c78573 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 24 Aug 2020 11:49:08 +1000
Subject: [PATCH] Fix crash

---
 Signal/src/Loki/View Controllers/HomeVC.swift             | 2 +-
 Signal/src/Loki/View Controllers/SettingsVC.swift         | 8 ++++----
 SignalMessaging/Loki/Redesign/Style Guide/Gradients.swift | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Signal/src/Loki/View Controllers/HomeVC.swift b/Signal/src/Loki/View Controllers/HomeVC.swift
index 728935795..3f1564d6f 100644
--- a/Signal/src/Loki/View Controllers/HomeVC.swift	
+++ b/Signal/src/Loki/View Controllers/HomeVC.swift	
@@ -352,7 +352,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIScrol
     @objc override internal func handleAppModeChangedNotification(_ notification: Notification) {
         super.handleAppModeChangedNotification(notification)
         let gradient = Gradients.homeVCFade
-        fadeView.setGradient(gradient) // Re-do gradient
+        fadeView.setGradient(gradient) // Re-do the gradient
         tableView.reloadData()
     }
     
diff --git a/Signal/src/Loki/View Controllers/SettingsVC.swift b/Signal/src/Loki/View Controllers/SettingsVC.swift
index a7c263fe9..dc65e60a2 100644
--- a/Signal/src/Loki/View Controllers/SettingsVC.swift	
+++ b/Signal/src/Loki/View Controllers/SettingsVC.swift	
@@ -117,8 +117,8 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
         topStackView.layoutMargins = UIEdgeInsets(top: 0, left: Values.largeSpacing, bottom: 0, right: Values.largeSpacing)
         topStackView.isLayoutMarginsRelativeArrangement = true
         // Set up setting buttons stack view
-        getSettingButtons().forEach { settingButton in
-            settingButtonsStackView.addArrangedSubview(settingButton)
+        getSettingButtons().forEach { settingButtonOrSeparator in
+            settingButtonsStackView.addArrangedSubview(settingButtonOrSeparator)
         }
         // Set up stack view
         let stackView = UIStackView(arrangedSubviews: [ topStackView, settingButtonsStackView ])
@@ -302,8 +302,8 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
             settingButtonsStackView.removeArrangedSubview(settingButton)
             settingButton.removeFromSuperview()
         }
-        getSettingButtons().forEach { settingButton in
-            settingButtonsStackView.addArrangedSubview(settingButton) // Re-do setting buttons
+        getSettingButtons().forEach { settingButtonOrSeparator in
+            settingButtonsStackView.addArrangedSubview(settingButtonOrSeparator) // Re-do the setting buttons
         }
     }
     
diff --git a/SignalMessaging/Loki/Redesign/Style Guide/Gradients.swift b/SignalMessaging/Loki/Redesign/Style Guide/Gradients.swift
index bbb3b884e..1af4d69d3 100644
--- a/SignalMessaging/Loki/Redesign/Style Guide/Gradients.swift	
+++ b/SignalMessaging/Loki/Redesign/Style Guide/Gradients.swift	
@@ -19,7 +19,7 @@ public final class Gradient : NSObject {
         let layer = CAGradientLayer()
         layer.frame = UIScreen.main.bounds
         layer.colors = [ gradient.start.cgColor, gradient.end.cgColor ]
-        if let existingSublayer = self.layer.sublayers?[0] {
+        if let existingSublayer = self.layer.sublayers?[0], existingSublayer is CAGradientLayer {
             self.layer.replaceSublayer(existingSublayer, with: layer)
         } else {
             self.layer.insertSublayer(layer, at: 0)