From ccc8ab70efd6342c7d4ed16e628b3eac98742301 Mon Sep 17 00:00:00 2001
From: Francisco Paisana <francisco.paisana@softwareradiosystems.com>
Date: Mon, 24 Aug 2020 13:33:06 +0100
Subject: [PATCH] stop t304 on handover procedure exit

---
 srsue/src/stack/rrc/rrc_procedures.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srsue/src/stack/rrc/rrc_procedures.cc b/srsue/src/stack/rrc/rrc_procedures.cc
index 0f736a1f9..65910d737 100644
--- a/srsue/src/stack/rrc/rrc_procedures.cc
+++ b/srsue/src/stack/rrc/rrc_procedures.cc
@@ -1513,7 +1513,6 @@ srslte::proc_outcome_t rrc::ho_proc::react(ra_completed_ev ev)
     return proc_outcome_t::yield;
   }
 
-  rrc_ptr->t304.stop();
   if (ev.success) {
     if (not rrc_ptr->measurements->parse_meas_config(&recfg_r8, true, ho_src_cell.get_earfcn())) {
       Error("Parsing measurementConfig. TODO: Send ReconfigurationReject\n");
@@ -1528,6 +1527,7 @@ srslte::proc_outcome_t rrc::ho_proc::react(ra_completed_ev ev)
 
 void rrc::ho_proc::then(const srslte::proc_state_t& result)
 {
+  rrc_ptr->t304.stop();
   Info("Finished HO Preparation %s\n", result.is_success() ? "successfully" : "with error");
   if (result.is_error()) {
     rrc_ptr->start_con_restablishment(reest_cause_e::ho_fail);