From 9f5e1bbd73e1738b7ab01814266ef6f5b375f8a4 Mon Sep 17 00:00:00 2001
From: "chleun.moon" <chleun.moon@samsung.com>
Date: Thu, 19 Jan 2017 18:42:59 +0900
Subject: [PATCH] Fix Dispose to release native resources only when Dispose is
 explicitly called

Change-Id: I059597481ac84b0967b7737c0950a913a2b65540
Signed-off-by: cheoleun <chleun.moon@samsung.com>
---
 src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAp.cs            | 4 ++--
 src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiConfiguration.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAp.cs b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAp.cs
index 35b1b67..59a0998 100644
--- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAp.cs
+++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAp.cs
@@ -96,9 +96,9 @@ namespace Tizen.Network.WiFi
             {
                 _network.Dispose();
                 _security.Dispose();
+                Interop.WiFi.Ap.Destroy(_apHandle);
+                _apHandle = IntPtr.Zero;
             }
-            Interop.WiFi.Ap.Destroy(_apHandle);
-            _apHandle = IntPtr.Zero;
             disposed = true;
         }
 
diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiConfiguration.cs b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiConfiguration.cs
index ac4d60a..fdf01bb 100644
--- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiConfiguration.cs
+++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiConfiguration.cs
@@ -160,9 +160,9 @@ namespace Tizen.Network.WiFi
             if (disposing)
             {
                 _eapConfig.Dispose();
+                Interop.WiFi.Config.Destroy(_configHandle);
+                _configHandle = IntPtr.Zero;
             }
-            Interop.WiFi.Config.Destroy(_configHandle);
-            _configHandle = IntPtr.Zero;
             disposed = true;
         }
 
-- 
2.7.4