From 965b06677aac855a219ebd048acd4d009809c0bb Mon Sep 17 00:00:00 2001
From: Daniel Sage <24928223+dnsge@users.noreply.github.com>
Date: Sun, 10 Jul 2022 09:08:20 -0400
Subject: [PATCH] Fix crash when closing and quickly opening a split, then
 running `/clearmessages` (#3852)

---
 CHANGELOG.md                                   | 1 +
 src/controllers/commands/CommandController.cpp | 6 +++++-
 src/widgets/Window.cpp                         | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17fb859e3..e2535c1f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - Minor: Added `/copy` command. Usage: `/copy <text>`. Copies provided text to clipboard - can be useful with custom commands. (#3763)
 - Minor: Removed total views from the usercard, as Twitch no longer updates the number. (#3792)
 - Minor: Add Quick Switcher item to open a channel in a new popup window. (#3828)
+- Bugfix: Fix crash that can occur when closing and quickly reopening a split, then running a command. (#3852)
 - Bugfix: Connection to Twitch PubSub now recovers more reliably. (#3643, #3716)
 - Bugfix: Fix crash that can occur when changing channels. (#3799)
 - Bugfix: Fixed viewers list search not working when used before loading finishes. (#3774)
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index 39e41a4fc..b0db5e731 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -932,7 +932,11 @@ void CommandController::initialize(Settings &, Paths &paths)
         auto *currentPage = dynamic_cast<SplitContainer *>(
             getApp()->windows->getMainWindow().getNotebook().getSelectedPage());
 
-        currentPage->getSelectedSplit()->getChannelView().clearMessages();
+        if (auto split = currentPage->getSelectedSplit())
+        {
+            split->getChannelView().clearMessages();
+        }
+
         return "";
     });
 
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index 8640276f4..d06a0bc9a 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -408,12 +408,13 @@ void Window::addShortcuts()
              {
                  splitContainer = this->notebook_->getOrAddSelectedPage();
              }
-             this->notebook_->select(splitContainer);
              Split *split = new Split(splitContainer);
              split->setChannel(
                  getApp()->twitch->getOrAddChannel(si.channelName));
              split->setFilters(si.filters);
              splitContainer->appendSplit(split);
+             splitContainer->setSelected(split);
+             this->notebook_->select(splitContainer);
              return "";
          }},
         {"toggleLocalR9K",