From 15eeab740590271e3e11342a5df7cf1a3a58e531 Mon Sep 17 00:00:00 2001
From: coffee-compiler <22056268-coffee-compiler@users.noreply.gitlab.com>
Date: Wed, 31 Jul 2024 07:41:35 +0000
Subject: [PATCH] Fix crash on server list entry deletion

---
 CHANGELOG.md                    | 1 +
 voxygen/src/menu/main/ui/mod.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72ca78f4ca..bd4f58e3e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Charm recipes can now be found in the Potions tab of the crafting menu
 - Black minimap when some terrain blocks are deleted.
 - Text overflow and flickering in the crafting menu.
+- Crash when deleting entries from the server list.
 
 ## [0.16.0] - 2024-03-30
 
diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs
index 1e3f7cd65f..dd3afa282e 100644
--- a/voxygen/src/menu/main/ui/mod.rs
+++ b/voxygen/src/menu/main/ui/mod.rs
@@ -583,6 +583,7 @@ impl Controls {
             Message::DeleteServer => {
                 if let Some(server_index) = self.selected_server_index {
                     events.push(Event::DeleteServer { server_index });
+                    self.selected_server_index = None;
                 }
             },
             /* Note: Keeping in case we re-add the disclaimer */