Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -rdb12df03b8067e1ccc81f190cabfb03359c3d8cb --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision db12df03b8067e1ccc81f190cabfb03359c3d8cb) @@ -195,16 +195,16 @@ return alarmIDText(static_cast(alarm_AlarmID())); } -QString VAlarmStatus::title () { QString s = _alarms[_alarm_AlarmID].title ; if ( ! s.isEmpty()) return s; else return tr("Alarm") ; } -QString VAlarmStatus::message () { QString s = _alarms[_alarm_AlarmID].message; if ( ! s.isEmpty()) return s; else return text() ; } -QStringList VAlarmStatus::instructionKeys () { return _alarms[_alarm_AlarmID].instructions.keys () ; } -QStringList VAlarmStatus::instructionValues () { return _alarms[_alarm_AlarmID].instructions.values () ; } +QString VAlarmStatus::title () { if ( ! _alarm_AlarmID ) return {}; QString s = _alarms[_alarm_AlarmID].title ; if ( ! s.isEmpty()) return s; else return tr("Alarm") ; } +QString VAlarmStatus::message () { if ( ! _alarm_AlarmID ) return {}; QString s = _alarms[_alarm_AlarmID].message; if ( ! s.isEmpty()) return s; else return text() ; } +QStringList VAlarmStatus::instructionKeys () { if ( ! _alarm_AlarmID ) return {}; return _alarms[_alarm_AlarmID].instructions.keys () ; } +QStringList VAlarmStatus::instructionValues () { if ( ! _alarm_AlarmID ) return {}; return _alarms[_alarm_AlarmID].instructions.values () ; } void VAlarmStatus::onActionReceive(const SettingsData &) { QStringList mCategorys = _Settings.categorys(); for (const QString &category : mCategorys) { - QStringList groups = _Settings.groups(category); if ( ! Storage::Settings::isCategoryAlarms( category ) ) continue; + QStringList groups = _Settings.groups(category); for (const auto &group : groups) { bool ok = true; @@ -214,9 +214,9 @@ AlarmData alarmData; InstructionData instructionData; for (const QString &key : _Settings.keys(group)) { - if (isTitle ( key ) ) { + if (Storage::Settings::isKeyTitle ( key ) ) { alarmData.title = _Settings.value(group, key).toString(); - } else if (isMessage ( key ) ) { + } else if (Storage::Settings::isKeyMessage ( key ) ) { alarmData.message = _Settings.value(group, key).toString(); } else { instructionData[key] = _Settings.value(group, key).toString();