merge dev changes

This commit is contained in:
RaidMax 2020-01-31 20:22:59 -06:00
commit 31c259f966
2 changed files with 1 additions and 4 deletions

View File

@ -303,7 +303,7 @@ namespace IW4MAdmin.Application
serverConfig.AddEventParser(parser);
}
newConfig.Servers = newConfig.Servers.Append((ServerConfiguration)serverConfig.Generate()).ToArray();
newConfig.Servers = newConfig.Servers.Where(_servers => _servers != null).Append((ServerConfiguration)serverConfig.Generate()).ToArray();
} while (Utilities.PromptBool(_translationLookup["SETUP_SERVER_SAVE"]));
config = newConfig;

View File

@ -31,9 +31,6 @@ namespace SharedLibraryCore.Configuration
[ConfigurationOptional]
public Uri GameLogServerUrl { get; set; }
[ConfigurationIgnore]
public int Index { get; set; }
private readonly IList<IRConParser> rconParsers;
private readonly IList<IEventParser> eventParsers;