Merge pull request #900 from uni-bremen-agst/898-usersettings-are-not-properly-saved

898 usersettings are not properly saved

Closes #898

Author: koschke

Assets/SEE/Net/Network.cs

@@ -911,12 +911,24 @@ private IList<AddressInfo> AddressesInfo
         public virtual void Save(ConfigWriter writer, string label)
         {
             writer.BeginGroup(label);
-            writer.Save(GameScene, gameSceneLabel);
-            writer.Save(ServerPort, serverPortLabel);
-            writer.Save(ServerIP4Address, serverIP4AddressLabel);
-            writer.Save(RoomPassword, roomPasswordLabel);
-            writer.Save(BackendServerAPI, backendServerAPILabel);
-            writer.EndGroup();
+            try
+            {
+                writer.Save(GameScene, gameSceneLabel);
+                writer.Save(RoomPassword, roomPasswordLabel);
+                writer.Save(BackendServerAPI, backendServerAPILabel);
+                writer.Save(ServerPort, serverPortLabel);
+                writer.Save(ServerIP4Address, serverIP4AddressLabel);
+            }
+            catch (System.Exception e)
+            {
+                Debug.LogError("An error occurred while saving the user settings.\n");
+                Debug.LogException(e);
+                throw;
+            }
+            finally
+            {
+                writer.EndGroup();
+            }
         }
 
         /// <summary>
@@ -931,7 +943,6 @@ public virtual void Restore(Dictionary<string, object> attributes, string label)
                 Dictionary<string, object> values = dictionary as Dictionary<string, object>;
 
                 ConfigIO.Restore(values, gameSceneLabel, ref GameScene);
-                ConfigIO.Restore(values, roomPasswordLabel, ref RoomPassword);
                 {
                     int value = ServerPort;
                     ConfigIO.Restore(values, serverPortLabel, ref value);
@@ -942,6 +953,7 @@ public virtual void Restore(Dictionary<string, object> attributes, string label)
                     ConfigIO.Restore(values, serverIP4AddressLabel, ref value);
                     ServerIP4Address = value;
                 }
+                ConfigIO.Restore(values, roomPasswordLabel, ref RoomPassword);
                 ConfigIO.Restore(values, backendServerAPILabel, ref BackendServerAPI);
             }
         }

Assets/SEE/UserSettings/UserSettings.cs

@@ -1,11 +1,13 @@
 using DG.Tweening;
+using OpenAI.Realtime;
 using SEE.GO;
 using SEE.Net;
 using SEE.Tools.OpenTelemetry;
 using SEE.Utils.Config;
 using SEE.Utils.Paths;
 using Sirenix.OdinInspector;
 using Sirenix.Serialization;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
@@ -159,7 +161,44 @@ private void OnApplicationQuit()
         {
             TracingHelperService.Shutdown(true);
             User.VoiceChat.EndVoiceChat(VoiceChat);
-            Instance.Save();
+        }
+
+        /// <summary>
+        /// Registers the quit callback when the object becomes enabled.
+        /// This ensures that application shutdown can be handled gracefully.
+        /// </summary>
+        private void OnEnable()
+        {
+            Application.wantsToQuit += SaveOnQuit;
+        }
+
+        /// <summary>
+        /// Unregisters the quit callback when the object is disabled.
+        /// This prevents callbacks from being invoked on inactive objects.
+        /// </summary>
+        private void OnDisable()
+        {
+            Application.wantsToQuit -= SaveOnQuit;
+        }
+
+        /// <summary>
+        /// Called when the application is about to quit.
+        /// Attempts to save the current instance state before shutdown.
+        /// </summary>
+        /// <returns>
+        /// Returns <c>true</c> to allow the application to quit.
+        /// </returns>
+        private bool SaveOnQuit()
+        {
+            try
+            {
+                Instance.Save();
+            }
+            catch (Exception e)
+            {
+                Debug.LogError($"Error during quit: {e}\n");
+            }
+            return true;
         }
 
         /// <summary>
@@ -311,12 +350,20 @@ private void Load(string filename)
         protected virtual void Save(ConfigWriter writer)
         {
             Player.Save(writer, playerLabel);
-            Network.Save(writer, networkLabel);
             writer.Save(VoiceChat.ToString(), voiceChatLabel);
             Telemetry.Save(writer, telemetryLabel);
             writer.Save(InputType.ToString(), inputTypeLabel);
             Video.Save(writer, videoLabel);
             Audio.Save(writer, audioLabel);
+            try
+            {
+                Network.Save(writer, networkLabel);
+            }
+            catch (System.Exception)
+            {
+                Debug.LogError("Network settings could not be saved.\n");
+                throw;
+            }
         }
 
         /// <summary>
@@ -326,12 +373,12 @@ protected virtual void Save(ConfigWriter writer)
         protected virtual void Restore(Dictionary<string, object> attributes)
         {
             Player.Restore(attributes, playerLabel);
-            Network.Restore(attributes, networkLabel);
             ConfigIO.RestoreEnum(attributes, voiceChatLabel, ref VoiceChat);
             Telemetry.Restore(attributes, telemetryLabel);
             ConfigIO.RestoreEnum(attributes, inputTypeLabel, ref InputType);
             Video.Restore(attributes, videoLabel);
             Audio.Restore(attributes, audioLabel);
+            Network.Restore(attributes, networkLabel);
         }
 
         #endregion Configuration I/O