From 8e312d4ae45fb0bf5c85adb53d9e9be30c749142 Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Sat, 3 Jun 2023 17:46:51 +0200
Subject: [PATCH] Moved RPC init/deinit to Program file

---
 PCK-Studio/App.config  | 3 +++
 PCK-Studio/MainForm.cs | 2 --
 PCK-Studio/Program.cs  | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/PCK-Studio/App.config b/PCK-Studio/App.config
index 4ee0e293..521fd32a 100644
--- a/PCK-Studio/App.config
+++ b/PCK-Studio/App.config
@@ -61,6 +61,9 @@
       <setting name="LoadSubPcks" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="ShowRichPresence" serializeAs="String">
+        <value>True</value>
+      </setting>
     </PckStudio.Properties.Settings>
   </userSettings>
 </configuration>
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index f96bc999..c7910e40 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -121,7 +121,6 @@ namespace PckStudio
 
 		private void Form1_Load(object sender, EventArgs e)
 		{
-			RPC.Initialize();
 			UpdateRPC();
 
 			skinToolStripMenuItem1.Click += (sender, e) => setFileType_Click(sender, e, PckFile.FileData.FileType.SkinFile);
@@ -148,7 +147,6 @@ namespace PckStudio
         private void FormMain_FormClosing(object sender, FormClosingEventArgs e)
 		{
 			checkSaveState();
-			RPC.Deinitialize();
 		}
 
 		private void openToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/PCK-Studio/Program.cs b/PCK-Studio/Program.cs
index b4bc97ac..ce550b93 100644
--- a/PCK-Studio/Program.cs
+++ b/PCK-Studio/Program.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
+using PckStudio.Classes.Misc;
 
 namespace PckStudio
 {
@@ -21,12 +22,13 @@ namespace PckStudio
         [STAThread]
         static void Main(string[] args)
         {
-            System.Globalization.CultureInfo.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
             ApplicationScope.Initialize();
+            RPC.Initialize();
             MainInstance = new MainForm();
             if (args.Length > 0 && File.Exists(args[0]) && args[0].EndsWith(".pck"))
                 MainInstance.LoadPckFromFile(args[0]);
             Application.Run(MainInstance);
+            RPC.Deinitialize();
         }
     }
 }