Merge pull request #166 from Commander-Scott/master

Fixes for issues #146, #151, #153
SEModCommunity · Sep 22, 2014 · 267be6a · 267be6a
2 parents 846abc2 + 9d65a2b
commit 267be6a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/SEModAPI/API/Definitions/DedicatedConfigDefinition.cs b/SEModAPI/API/Definitions/DedicatedConfigDefinition.cs
@@ -8,6 +8,7 @@
 using System.Xml;
 
 using Sandbox.Common.ObjectBuilders;
+using System.Linq;
 
 namespace SEModAPI.API.Definitions
 {
@@ -681,13 +682,15 @@ public int AsteroidAmount
         /// <summary>
         /// Get or set the list of administrators of the server
         /// </summary>
-        public List<string> Administrators
+		public BindingList<string> Administrators
         {
-            get { return m_definition.Administrators; }
+			get
+			{
+				return new BindingList<string>(m_definition.Administrators);
+			}
             set
             {
-                if (m_definition.Administrators == value) return;
-                m_definition.Administrators = value;
+				m_definition.Administrators = value.ToList();
                 Changed = true;
             }
         }

diff --git a/SEModAPIInternal/API/Common/WorldManager.cs b/SEModAPIInternal/API/Common/WorldManager.cs
@@ -235,13 +235,15 @@ internal void InternalSaveWorld()
 				Type type = BackingObject.GetType();
 				Type[] argTypes = new Type[1];
 				argTypes[0] = typeof(string);
+
+				m_isSaving = true;
 				bool result = (bool)BaseObject.InvokeEntityMethod(BackingObject, WorldManagerSaveWorldMethod, new object[] { null }, argTypes);
+				m_isSaving = false;
 
 				if (result)
 				{
 					TimeSpan timeToSave = DateTime.Now - saveStartTime;
 					LogManager.APILog.WriteLineAndConsole("Save complete and took " + timeToSave.TotalSeconds + " seconds");
-					m_isSaving = false;
 
 					EntityEventManager.EntityEvent newEvent = new EntityEventManager.EntityEvent();
 					newEvent.type = EntityEventManager.EntityEventType.OnSectorSaved;
@@ -253,11 +255,11 @@ internal void InternalSaveWorld()
 				else
 				{
 					LogManager.APILog.WriteLineAndConsole("Save failed!");
-					m_isSaving = false;
 				}
 			}
 			catch (Exception ex)
 			{
+				m_isSaving = false;
 				LogManager.ErrorLog.WriteLine(ex);
 			}
 		}

diff --git a/SEModAPIInternal/Support/LogManager.cs b/SEModAPIInternal/Support/LogManager.cs
@@ -166,13 +166,15 @@ public void WriteLineAndConsole(string msg)
 				return;
 
 			WriteLine(msg);
-
-			m_stringBuilder.Clear();
-			AppendDateAndTime(m_stringBuilder);
-			m_stringBuilder.Append(" - ");
-			m_stringBuilder.Append(msg);
-			Console.WriteLine(m_stringBuilder.ToString());
-			m_stringBuilder.Clear();
+			lock (_logLock)
+			{
+				m_stringBuilder.Clear();
+				AppendDateAndTime(m_stringBuilder);
+				m_stringBuilder.Append(" - ");
+				m_stringBuilder.Append(msg);
+				Console.WriteLine(m_stringBuilder.ToString());
+				m_stringBuilder.Clear();
+			}
 		}
 
 		private int GetThreadId()