Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

merge dev changes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/ApplicationManager.cs
View File

@ -303,7 +303,7 @@ namespace IW4MAdmin.Application
serverConfig.AddEventParser(parser); 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"])); } while (Utilities.PromptBool(_translationLookup["SETUP_SERVER_SAVE"]));
config = newConfig; config = newConfig;

3
SharedLibraryCore/Configuration/ServerConfiguration.cs
View File

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