From 93b7d67acdbc0a2acb5fa1bb905da4344a7e64da Mon Sep 17 00:00:00 2001
From: Mason Sciotti <mason.sciotti@gmail.com>
Date: Mon, 21 Sep 2020 13:12:21 -0700
Subject: [PATCH] Cast to int

---
 .../Source/DiscordRpc/Private/DiscordRpcBlueprint.cpp         | 2 +-
 .../discordrpc/Source/DiscordRpc/Public/DiscordRpcBlueprint.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/unrealstatus/Plugins/discordrpc/Source/DiscordRpc/Private/DiscordRpcBlueprint.cpp b/examples/unrealstatus/Plugins/discordrpc/Source/DiscordRpc/Private/DiscordRpcBlueprint.cpp
index f76ebcb..8925d8e 100644
--- a/examples/unrealstatus/Plugins/discordrpc/Source/DiscordRpc/Private/DiscordRpcBlueprint.cpp
+++ b/examples/unrealstatus/Plugins/discordrpc/Source/DiscordRpc/Private/DiscordRpcBlueprint.cpp
@@ -153,7 +153,7 @@ void UDiscordRpc::UpdatePresence()
     rp.endTimestamp = RichPresence.endTimestamp;
     rp.partySize = RichPresence.partySize;
     rp.partyMax = RichPresence.partyMax;
-    rp.partyPrivacy = RichPresence.partyPrivacy;
+    rp.partyPrivacy = (int)RichPresence.partyPrivacy;
     rp.instance = RichPresence.instance;
 
     Discord_UpdatePresence(&rp);
diff --git a/examples/unrealstatus/Plugins/discordrpc/Source/DiscordRpc/Public/DiscordRpcBlueprint.h b/examples/unrealstatus/Plugins/discordrpc/Source/DiscordRpc/Public/DiscordRpcBlueprint.h
index c612a6d..409eee0 100644
--- a/examples/unrealstatus/Plugins/discordrpc/Source/DiscordRpc/Public/DiscordRpcBlueprint.h
+++ b/examples/unrealstatus/Plugins/discordrpc/Source/DiscordRpc/Public/DiscordRpcBlueprint.h
@@ -87,11 +87,7 @@ struct FDiscordRichPresence {
     UPROPERTY(BlueprintReadWrite)
     int partyMax;
     UPROPERTY(BlueprintReadWrite)
-<<<<<<< Updated upstream
-    int partyPrivacy;
-=======
     EDiscordPartyPrivacy partyPrivacy;
->>>>>>> Stashed changes
     UPROPERTY(BlueprintReadWrite)
     FString matchSecret;
     UPROPERTY(BlueprintReadWrite)