From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 8 Jun 2024 05:34:48 +0000 (-0700)
Subject: Fix action icons when dragging an active action to another slot (#28692)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0762f9da175966700ed961200ab3329dc556c12d;p=space-station-14.git

Fix action icons when dragging an active action to another slot (#28692)
---

diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index 6be41af0d8..0d12d87171 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -289,6 +289,10 @@ public sealed class ActionButton : Control, IEntityControl
         {
             if (_action.IconOn != null)
                 SetActionIcon(_spriteSys.Frame0(_action.IconOn));
+            else if (_action.Icon != null)
+                SetActionIcon(_spriteSys.Frame0(_action.Icon));
+            else
+                SetActionIcon(null);
 
             if (_action.BackgroundOn != null)
                 _buttonBackgroundTexture = _spriteSys.Frame0(_action.BackgroundOn);