Index: sources/drydemo/StateControllerStandby.cpp
===================================================================
diff -u -r0deaf8f3e192a0ecde953ab65efc1ded1c06269b -r521f29cb7dcd0de352dd744292488380e07cb9e3
--- sources/drydemo/StateControllerStandby.cpp	(.../StateControllerStandby.cpp)	(revision 0deaf8f3e192a0ecde953ab65efc1ded1c06269b)
+++ sources/drydemo/StateControllerStandby.cpp	(.../StateControllerStandby.cpp)	(revision 521f29cb7dcd0de352dd744292488380e07cb9e3)
@@ -105,6 +105,7 @@
     _treatmentStatus.triggerAlarmTimeoutCtr     = 0;
     _treatmentStatus.isBloodPumpRunning         = false;
     _treatmentStatus.txPauseSeqAlarmState       = SEQ_ALARM_NO_ALARM;
+    _treatmentStatus.txPauseBloodSittingCounter = 0;
     // Initialize alarm varibales to be alarm no alarm
     _treatmentStatus.activeTopAlarm             = ALARM_ID_NO_ALARM;
     _treatmentStatus.activeAlarmProperty        = _alarmTriggerSpecs[ALARM_ID_NO_ALARM][ALARM_TABLE_PROPERTIES_INDEX].toInt();
@@ -138,6 +139,7 @@
     _treatmentStatus.bicartDepresInProgress     = 0;
     _treatmentStatus.bicartProgress             = 0;
     _treatmentStatus.bicartTotal                = 100;
+    _treatmentStatus.bicartShowDialog           = DRY_BICART_OPEN_SCREEN;
 
     // UI confirm
     _uiConfirmMessages.clear();
@@ -199,15 +201,16 @@
             break;
 
         case ALARM_USER_ACTION_RINSEBACK:
-        case ALARM_USER_ACTION_TEMPOARY_BREAK:
             handleSendUIConfirmationMessage(GENERIC_CONFIRM_ID_RINSEBACK, GENERIC_CONFIRM_CMD_REQUEST_OPEN);
-            // Set the flag to go to recirculate
-            if (userAction == ALARM_USER_ACTION_TEMPOARY_BREAK) { _treatmentStatus.hasRecircBeenRequested = true; }
             break;
 
+        case ALARM_USER_ACTION_TEMPOARY_BREAK:
+            handleSendUIConfirmationMessage(GENERIC_CONFIRM_ID_TEMPORARY_BREAK, GENERIC_CONFIRM_CMD_REQUEST_OPEN);
+            break;
+
         case ALARM_USER_ACTION_END_TREATMENT:
             handleSendUIConfirmationMessage(GENERIC_CONFIRM_ID_TREATMENT_END, GENERIC_CONFIRM_CMD_REQUEST_OPEN);
-            _treatmentStatus.stateTransitionEvent = "T_TP_2_TE";
+            _treatmentStatus.stateTransitionEvent = "T_TP_2_RB";
             break;
 
         default:
@@ -344,13 +347,11 @@
     switch (confirmID) {
         case GENERIC_CONFIRM_ID_TREATMENT_END:
             if (_uiConfirmMessages[confirmID].confirmStatus == CONFIRMATION_REQUEST_STATUS_ACCEPTED) {
-                QStringList activeStates = _dryDemo.activeStateNames(true);
-                // Check if there is at least one value in the string list to prevent segmentatoin fault
-                QString activeState      = (activeStates.length() >= 1 ? activeStates[0] : "");
+                QString activeState = getActiveStateName();
                 if (activeState == "Treatment_Recirculate")    { _treatmentStatus.stateTransitionEvent = "T_RC_2_Posttx"; }
                 else if (activeState == "Treatment_Rinseback") { _treatmentStatus.stateTransitionEvent = "T_RB_2_Posttx"; }
-                else if (activeState == "Treatment_End")       { _treatmentStatus.stateTransitionEvent = "T_TE_2_RB"; }
-                else if (activeState == "Treatment_Pause")     { _treatmentStatus.stateTransitionEvent = "T_TP_2_RB"; }
+                else if (activeState == "Treatment_End")       { _treatmentStatus.stateTransitionEvent = "T_TE_2_RB";     }
+                else if (activeState == "Treatment_Pause")     { _treatmentStatus.stateTransitionEvent = "T_TP_2_RB";     }
                 _uiConfirmMessages[confirmID].confirmStatus = CONFIRMATION_REQUEST_STATUS_UNUSED;
                 status                                      = STATE_ON_EXIT;
                 qDebug() << "Event" << activeState << _treatmentStatus.stateTransitionEvent << _dryDemo.activeStateNames(true);
@@ -360,8 +361,8 @@
             break;
 
         case GENERIC_CONFIRM_ID_RINSEBACK:
+        case GENERIC_CONFIRM_ID_TEMPORARY_BREAK:
             if (_uiConfirmMessages[confirmID].confirmStatus == CONFIRMATION_REQUEST_STATUS_ACCEPTED) {
-                qDebug() << "Rinse back response"  << confirmID << _uiConfirmMessages[confirmID].confirmStatus;
                 handleSendUIConfirmationMessage(confirmID, GENERIC_CONFIRM_CMD_ACCEPT_CLOSE);
                 _treatmentStatus.stateTransitionEvent       = "T_TP_2_RB";
                 _uiConfirmMessages[confirmID].confirmStatus = CONFIRMATION_REQUEST_STATUS_UNUSED;
@@ -371,9 +372,6 @@
             }
             break;
 
-        case GENERIC_CONFIRM_ID_TEMPORARY_BREAK:
-            break;
-
         default:
         case GENERIC_CONFIRM_ID_NONE:
         case GENERIC_CONFIRM_ID_SHUT_DOWN: