Merge branch 'master' into debug-config-rename

This commit is contained in:
Dean Herbert
2017-05-20 00:45:16 +09:00
committed by GitHub
2 changed files with 8 additions and 2 deletions

View File

@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
protected override string Header => "General";
[BackgroundDependencyLoader]
private void load(FrameworkDebugConfigManager config)
private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig)
{
Children = new Drawable[]
{
@ -20,6 +20,11 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
{
LabelText = "Bypass caching",
Bindable = config.GetBindable<bool>(DebugSetting.BypassCaching)
},
new SettingsCheckbox
{
LabelText = "Debug logs",
Bindable = frameworkConfig.GetBindable<bool>(DebugSetting.ShowLogOverlay)
}
};
}