1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 10:17:19 +08:00

Merge branch 'master' into osd-fixes

This commit is contained in:
Dan Balasescu 2017-05-20 00:12:10 +09:00 committed by GitHub
commit 7e8ffe8f34

View File

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