From db36fb08a2be006ed6da9004b80f2611da145262 Mon Sep 17 00:00:00 2001
From: Xavier Arteaga <xavier@softwareradiosystems.com>
Date: Mon, 9 Dec 2019 11:25:41 +0100
Subject: [PATCH] SRSUE: fix intra-frequency measurement cell select

---
 srsue/src/phy/sync.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srsue/src/phy/sync.cc b/srsue/src/phy/sync.cc
index 9b6de4fc0..e87942835 100644
--- a/srsue/src/phy/sync.cc
+++ b/srsue/src/phy/sync.cc
@@ -324,6 +324,9 @@ bool sync::cell_select(phy_interface_rrc_lte::phy_cell_t* new_cell)
         return ret;
       }
     }
+
+    /* Reconfigure intra-frequency measurement */
+    intra_freq_meas.set_primay_cell(current_earfcn, cell);
   }
 
   /* Change sampling rate if necessary */
@@ -814,7 +817,6 @@ bool sync::set_cell()
   }
   sfn_p.set_cell(cell);
   worker_com->set_cell(cell);
-  intra_freq_meas.set_primay_cell(current_earfcn, cell);
 
   for (uint32_t i = 0; i < workers_pool->get_nof_workers(); i++) {
     if (!((sf_worker*)workers_pool->get_worker(i))->set_cell(0, cell)) {