Commit cf3eed16 authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb39585' into 'master'

Change default device lock timeout to immediate

See merge request !29
parents 82172d2f c83cb940
......@@ -57,7 +57,7 @@ Requires: pkgconfig(nemodbus)
%build
%qmake5
make %{?jobs:-j%jobs}
make make %{?_smp_mflags}
%install
rm -rf %{buildroot}
......
......@@ -81,7 +81,7 @@ SettingsWatcher *SettingsWatcher::sharedInstance = nullptr;
SettingsWatcher::SettingsWatcher(QObject *parent)
: QSocketNotifier(inotify_init(), Read, parent)
, automaticLocking(10)
, automaticLocking(0)
, minimumLength(5)
, maximumLength(42)
, maximumAttempts(-1)
......@@ -253,7 +253,7 @@ void SettingsWatcher::reloadSettings()
GKeyFile * const settings = g_key_file_new();
g_key_file_load_from_file(settings, m_settingsPath.toUtf8().constData(), G_KEY_FILE_NONE, 0);
read(settings, this, automaticLockingKey, 5, &automaticLocking, &SettingsWatcher::automaticLockingChanged);
read(settings, this, automaticLockingKey, 0, &automaticLocking, &SettingsWatcher::automaticLockingChanged);
read(settings, this, minimumLengthKey, 5, &minimumLength, &SettingsWatcher::minimumLengthChanged);
read(settings, this, maximumLengthKey, 42, &maximumLength, &SettingsWatcher::maximumLengthChanged);
read(settings, this, maximumAttemptsKey, -1, &maximumAttempts, &SettingsWatcher::maximumAttemptsChanged);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment