Fix NRE with presence activities (DSharpPlus#1214)

Ernest314 · Feb 18, 2022 · f467726 · f467726
1 parent 9a21d7f
commit f467726
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/DSharpPlus/Entities/User/DiscordPresence.cs b/DSharpPlus/Entities/User/DiscordPresence.cs
@@ -93,8 +93,10 @@ internal DiscordPresence() { }
         internal DiscordPresence(DiscordPresence other)
         {
             this.Discord = other.Discord;
-            this.Activity = new DiscordActivity(other.Activity);
-            this.RawActivity = new TransportActivity(this.Activity);
+            if (other.Activity != null)
+                this.Activity = new DiscordActivity(other.Activity);
+            if (other.Activity != null)
+                this.RawActivity = new TransportActivity(this.Activity);
             this._internalActivities = (DiscordActivity[])other._internalActivities?.Clone();
             this.RawActivities = (TransportActivity[])other.RawActivities?.Clone();
             this.Status = other.Status;