Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r0536992850014cee0a949958ce56c0008615da41 -rb543920c939d90945b271985dd9fbbae67e60b83 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 0536992850014cee0a949958ce56c0008615da41) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision b543920c939d90945b271985dd9fbbae67e60b83) @@ -117,6 +117,16 @@ } // disabled coco end + //// ------ HIDE THE DIALOG - if has NO the alarm ------ + // DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm + if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { + hasAlarm(false); + _alarm_AlarmID = 0; + emit didAlarmEmpty(); + return; + } + + //// ----- SET PROPERTY VALUES ------ // Look for this tag: #First_Time_Message_Sent_With_Silenced // this has to be first to make sure in the Notification dialog when we decided to show the dialog, // we should also consider checking the alarms Silenced and if it is already silenced, @@ -150,29 +160,24 @@ } alarm_Flag_alarmsCondition (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION )); - if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { - hasAlarm(false); - emit didAlarmEmpty(); + hasAlarm(true); + + if ( + // alarm id properties + _alarm_AlarmIDChanged + || _alarm_PriorityChanged + // alarm buttons + || _alarm_Flag_noResumeChanged + || _alarm_Flag_noRinsebackChanged + || _alarm_Flag_noEndTreatmentChanged + || _alarm_Flag_UserMustAckChanged + // alarm cannot be minimized + || ( _alarm_Flag_noMinimizeChanged && _alarm_Flag_noMinimize ) + // alarm is out of silence + || ( _alarm_Flag_alarmsSilencedChanged && ! _alarm_Flag_alarmsSilenced ) + ){ + emit didAlarmRaise(); } - else { - hasAlarm(true); - if ( - // alarm id properties - _alarm_AlarmIDChanged - || _alarm_PriorityChanged - // alarm buttons - || _alarm_Flag_noResumeChanged - || _alarm_Flag_noRinsebackChanged - || _alarm_Flag_noEndTreatmentChanged - || _alarm_Flag_UserMustAckChanged - // alarm cannot be minimized - || ( _alarm_Flag_noMinimizeChanged && _alarm_Flag_noMinimize ) - // alarm is out of silence - || ( _alarm_Flag_alarmsSilencedChanged && ! _alarm_Flag_alarmsSilenced ) - ){ - emit didAlarmRaise(); - } - } } /*!