From ee5d559cbdb3423c3869b7f03edc0c0cf4451bb8 Mon Sep 17 00:00:00 2001
From: Tomasz Marciniak <t.marciniak@samsung.com>
Date: Mon, 18 May 2015 14:12:53 +0200
Subject: [PATCH] [NBS] Unregister listener when profile is disconnected.

[Verification] Code compiles without errors.
Manual test NetworkSuccessCallback_ondisconnected passes.
TCT Auto passrate 100%

Change-Id: I37ff7d6030967e369c2a95e8aeb5b49f00a6d527
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
---
 .../networkbearerselection_manager.cc                 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/networkbearerselection/networkbearerselection_manager.cc b/src/networkbearerselection/networkbearerselection_manager.cc
index 6879bc2b..b1c01c56 100644
--- a/src/networkbearerselection/networkbearerselection_manager.cc
+++ b/src/networkbearerselection/networkbearerselection_manager.cc
@@ -87,12 +87,13 @@ void NetworkBearerSelectionManager::connection_state_changed_callback(
     }
     NetworkBearerSelectionRequestEvent* event =
         static_cast<NetworkBearerSelectionRequestEvent*>(user_data);
-    std::string domain_name = event->domain_name;
-    delete event;
-    NetworkBearerSelectionManager::GetInstance()->deregistStateChangeListener(domain_name);
+
     if (state == CONNECTION_PROFILE_STATE_DISCONNECTED) {
-      NetworkBearerSelectionManager::GetInstance()->makeDisconnectCallback(
-          domain_name);
+      std::string domain_name = event->domain_name;
+      NetworkBearerSelectionManager::GetInstance()->deregistStateChangeListener(domain_name);
+      delete event;
+
+      NetworkBearerSelectionManager::GetInstance()->makeDisconnectCallback(domain_name);
     }
   }
 }
-- 
2.34.1