diff --git a/7thHeaven.Code/Profile.cs b/7thHeaven.Code/Profile.cs index 51a23d40..686abe29 100644 --- a/7thHeaven.Code/Profile.cs +++ b/7thHeaven.Code/Profile.cs @@ -172,8 +172,18 @@ private bool IsConfigActive(string spec) { if (parts.Length != 2) return false; parts = new[] { parts[0].Trim(), spec.Substring(parts[0].Length, spec.Length - parts[1].Length - parts[0].Length), parts[1].Trim() }; - var conf = Settings.Find(c => c.ID.Equals(parts[0], StringComparison.InvariantCultureIgnoreCase)); - if (conf == null) return false; + var conf = new ProfileSetting(); + + if (parts[0].StartsWith("ffnx_", StringComparison.InvariantCultureIgnoreCase)) + { + var key = parts[0].Substring(5); + if (Sys.FFNxConfig.HasKey(key)) conf = new ProfileSetting() { ID = key, Value = int.Parse(Sys.FFNxConfig.Get(key)) }; + } + else + { + conf = Settings.Find(c => c.ID.Equals(parts[0], StringComparison.InvariantCultureIgnoreCase)); + if (conf == null) return false; + } int val; if (!int.TryParse(parts[2], out val)) return false;