From d4e240ca1bee8f9deac380b5e11d5f2baf5b32e6 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 15 Jun 2017 19:12:19 +0200 Subject: [PATCH] Ref T45, Ref T28 set default consolidation time (which also is supposed to solve timeout issue) --- src/blackgui/components/settingsmodelcomponent.ui | 10 +--------- src/blackgui/settings/guisettings.h | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/blackgui/components/settingsmodelcomponent.ui b/src/blackgui/components/settingsmodelcomponent.ui index cfe70c927..1516ecb03 100644 --- a/src/blackgui/components/settingsmodelcomponent.ui +++ b/src/blackgui/components/settingsmodelcomponent.ui @@ -2,16 +2,8 @@ CSettingsModelComponent - - - 0 - 0 - 374 - 28 - - - Frame + Models settings diff --git a/src/blackgui/settings/guisettings.h b/src/blackgui/settings/guisettings.h index 62f5c61cc..6e6158df0 100644 --- a/src/blackgui/settings/guisettings.h +++ b/src/blackgui/settings/guisettings.h @@ -97,7 +97,7 @@ namespace BlackGui static bool isValid(const int &valueInSeconds) { return valueInSeconds == -1 || (valueInSeconds >= minSecs() && valueInSeconds <= maxSecs()); } //! Default, not consolidating - static const int &defaultValue() { static const int i = -1; return i; } + static const int &defaultValue() { static const int i = 240; return i; } //! Minimum static int minSecs() { return 60; }