fixed delete duplicate problem (#108)

* fixed delete duplicate problem * Update gus.go
JensvandeWiel · Nov 11, 2023 · c2ad30b · c2ad30b
1 parent 7a9762e
commit c2ad30b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/server/game.go b/server/game.go
@@ -277,9 +277,7 @@ func (s *Server) SaveGameIni() error {
 		return err
 	}
 
-	gIni := ini.Empty()
-
-	gIni, err := ini.Load(filepath.Join(s.ServerPath, "ShooterGame\\Saved\\Config\\WindowsServer\\Game.ini"))
+	gIni, err := ini.LoadSources(iniOpts, filepath.Join(s.ServerPath, "ShooterGame\\Saved\\Config\\WindowsServer\\Game.ini"))
 	if err != nil {
 		return err
 	}

diff --git a/server/gus.go b/server/gus.go
@@ -428,9 +428,7 @@ func (s *Server) SaveGameUserSettingsIni() error {
 		return err
 	}
 
-	gusIni := ini.Empty()
-
-	gusIni, err := ini.Load(filepath.Join(s.ServerPath, "ShooterGame\\Saved\\Config\\WindowsServer\\GameUserSettings.ini"))
+	gusIni, err := ini.LoadSources(iniOpts, filepath.Join(s.ServerPath, "ShooterGame\\Saved\\Config\\WindowsServer\\GameUserSettings.ini"))
 	if err != nil {
 		return err
 	}

diff --git a/server/helpers.go b/server/helpers.go
@@ -3,6 +3,7 @@ package server
 import (
 	"fmt"
 	"github.com/JensvandeWiel/ArkAscendedServerManager/helpers"
+	"github.com/go-ini/ini"
 	"github.com/sethvargo/go-password/password"
 	"github.com/wailsapp/wails/v2/pkg/runtime"
 	"io"
@@ -217,3 +218,8 @@ func (c *ServerController) GetServerDir() string {
 }
 
 //endregion
+
+var iniOpts = ini.LoadOptions{
+	AllowShadows:               true,
+	AllowDuplicateShadowValues: true,
+}