If a save ever failed, no subsequent save would ever be attempted.

SignatureBeef · Jul 31, 2011 · 6402476 · 6402476
1 parent 9878377
commit 6402476
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/Terraria_Server/NetPlay.cs b/Terraria_Server/NetPlay.cs
@@ -249,7 +249,11 @@ public static void ServerLoop ()
 				catch {}
 			}
 
-            WorldIO.saveWorld(Program.server.World.SavePath, true);
+			if (false == WorldIO.saveWorld(Program.server.World.SavePath, true))
+			{
+				WorldIO.saveWorld(Program.server.World.SavePath, true);
+				ProgramLog.Log("Saving failed.  Quitting without saving.");
+			}
 
 			Statics.serverStarted = false;
 		}

diff --git a/Terraria_Server/WorldMod/WorldIO.cs b/Terraria_Server/WorldMod/WorldIO.cs
@@ -122,16 +122,18 @@ public static void clearWorld()
 			worldCleared = true;
 		}
 
-		public static void saveWorld(String savePath, bool resetTime = false)
+		public static Boolean saveWorld(String savePath, bool resetTime = false)
 		{
+			Boolean success = true;
+
 			if (savePath == null)
 			{
-				return;
+				return false;
 			}
 
 			if (WorldModify.saveLock)
 			{
-				return;
+				return false;
 			}
 
 			try
@@ -335,13 +337,19 @@ public static void saveWorld(String savePath, bool resetTime = false)
 					}
 					stopwatch.Stop();
 					ProgramLog.Log("Save duration: " + stopwatch.Elapsed.Seconds + " Second(s)");
-					WorldModify.saveLock = false;
 				}
 			}
 			catch (Exception e)
 			{
 				ProgramLog.Log(e, "Exception saving the world");
+				success = false;
+			}
+			finally
+			{
+				WorldModify.saveLock = false;
 			}
+
+			return success;
 		}
 
 		public static void loadWorld()