Reset Game.cs after build in a defer block

Author: juho05

build.go

@@ -35,13 +35,19 @@ func Build() error {
 	}
 }
 
-func buildClient(gameName, output, url, os, arch string) error {
+func buildClient(gameName, output, url, os, arch string) (err error) {
 	cli.BeginLoading("Building...")
 	gameDir := toPascal(gameName)
-	err := replaceInFile(filepath.Join(gameDir, "Game.cs"), "throw new InvalidOperationException(\"The CG_GAME_URL environment variable must be set.\")", "return \""+url+"\"")
+	err = replaceInFile(filepath.Join(gameDir, "Game.cs"), "throw new InvalidOperationException(\"The CG_GAME_URL environment variable must be set.\")", "return \""+url+"\"")
 	if err != nil {
 		return err
 	}
+	defer func() {
+		err2 := replaceInFile(filepath.Join(gameDir, "Game.cs"), "return \""+url+"\"", "throw new InvalidOperationException(\"The CG_GAME_URL environment variable must be set.\")")
+		if err == nil && err2 != nil {
+			err = err2
+		}
+	}()
 
 	args := []string{"publish", "--nologo", "--configuration", "Release", "--self-contained"}
 	if os == "current" {
@@ -59,10 +65,6 @@ func buildClient(gameName, output, url, os, arch string) error {
 		return err
 	}
 
-	err = replaceInFile(filepath.Join(gameDir, "Game.cs"), "return \""+url+"\"", "throw new InvalidOperationException(\"The CG_GAME_URL environment variable must be set.\")")
-	if err != nil {
-		return err
-	}
 	cli.FinishLoading()
 
 	return nil

templates/new/client/Game.cs.tmpl

@@ -36,7 +36,7 @@ public partial class Game : IDisposable
     /// </summary>
     public GameConfig Config { get; private set; }
     /// <summary>
-    /// Whether the socket is connected in spectate mode.
+    /// Whether the socket is connected as a spectator.
     /// </summary>
     public bool Spectating { get; private set; }
     /// <summary>
@@ -47,21 +47,21 @@ public partial class Game : IDisposable
     private GameSocket socket;
 
     /// <summary>
-    /// Parses the command line arguments and creates a new game depending on which flags and commands were used.
+    /// Parses the command line arguments and creates a new game depending on which flags and commands are used.
     /// <para>
     /// Commands:
     /// <list type="bullet">
-    /// <item>create      (Creates a new game and joins it.)</item>
-    /// <item>join        (Joins an existing game.)</item>
-    /// <item>reconnect   (Reconnects to an existing session.)</item>
+    /// <item>create      Creates a new game and joins it.</item>
+    /// <item>join        Joins an existing game.</item>
+    /// <item>reconnect   Reconnects to an existing session.</item>
     /// </list>
     /// </para>
     /// <para>
     /// Flags:
     /// <list type="bullet">
-    /// <item>--public (Makes the created game public)</item>
-    /// <item>--protected (Makes the created game protected.</item>
-    /// <item>--spectate (Spectates the game instead of joining it. (the username is not necessary if this flag is set)</item>
+    /// <item>--public    Makes the created game public.</item>
+    /// <item>--protected Makes the created game protected.</item>
+    /// <item>--spectate Spectates the game instead of joining it. (the username is not necessary if this flag is set)</item>
     /// </list>
     /// </para>
     /// </summary>