From 4ac07e5abbe2b03fbc0e117fbdc736f87437b08e Mon Sep 17 00:00:00 2001
From: Francisco Paisana <paisanaf@tcd.ie>
Date: Mon, 6 Apr 2020 12:14:16 +0100
Subject: [PATCH] simplified power off state transition

---
 lib/test/common/fsm_test.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/test/common/fsm_test.cc b/lib/test/common/fsm_test.cc
index bd9e0cabe..c888e71b9 100644
--- a/lib/test/common/fsm_test.cc
+++ b/lib/test/common/fsm_test.cc
@@ -317,9 +317,10 @@ protected:
   auto react(emm_ta_updating_initiated& s, tau_outcome_ev ev) -> to_state<emm_registered>;
   auto react(emm_ta_updating_initiated& s, tau_reject_other_cause_ev ev) -> to_state<emm_deregistered>;
   auto react(emm_deregistered_initiated& s, detach_accept_ev ev) -> to_state<emm_deregistered>;
-  template <typename AnyState,
-            typename = typename std::enable_if<not std::is_same<AnyState, emm_deregistered>::value>::type>
+  // on power-off go to deregistered state. Disable react if we are already in deregistered
+  template <typename AnyState>
   auto react(AnyState& s, power_off_ev ev) -> to_state<emm_deregistered>;
+  auto react(emm_deregistered& s, power_off_ev ev) -> srslte::same_state { return {}; }
 
   state_list<emm_null_st,
              emm_deregistered,
@@ -398,7 +399,7 @@ auto nas_fsm::react(emm_deregistered_initiated& s, detach_accept_ev ev) -> to_st
   LOGEVENT();
   return {};
 }
-template <typename AnyState, typename>
+template <typename AnyState>
 auto nas_fsm::react(AnyState& s, power_off_ev ev) -> to_state<emm_deregistered>
 {
   LOGEVENT();