Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r0ef1d5494980124c4fad236493ec86b355a2210e -r99d784a67bb8c23bdd436c06609a4e4b5ba7cfad --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 0ef1d5494980124c4fad236493ec86b355a2210e) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 99d784a67bb8c23bdd436c06609a4e4b5ba7cfad) @@ -1458,8 +1458,7 @@ } } // check special cases where we do not want to clear this alarm - otherwise, clear it - if ( ( ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT == a ) || ( ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT == a ) ) && - ( TRUE == alarmIsDetected[ a ] ) && ( mode != MODE_POST ) && + if ( ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT == a ) && ( TRUE == alarmIsDetected[ a ] ) && ( mode != MODE_POST ) && ( action != ALARM_USER_ACTION_RINSEBACK ) && ( action != ALARM_USER_ACTION_END_TREATMENT ) ) { // do not clear this alarm if condition not cleared first (unless treatment is over)