Merge "DALi Version 1.2.27" into devel/master

[platform/core/uifw/dali-core.git] / dali / public-api / signals / signal-slot-connections.cpp

diff --git a/dali/public-api/signals/signal-slot-connections.cpp b/dali/public-api/signals/signal-slot-connections.cpp
index c74d3c9..a4bb208 100644 (file)
--- a/dali/public-api/signals/signal-slot-connections.cpp
+++ b/dali/public-api/signals/signal-slot-connections.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/public-api/signals/signal-slot-connections.h>
 
+// EXTERNAL INCLUDES
+#include <cstddef>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/signals/callback.h>
 
@@ -32,8 +35,6 @@ SlotConnection::SlotConnection( SlotObserver* slotObserver, CallbackBase* callba
 
 SlotConnection::~SlotConnection()
 {
-  // slot connections have ownership of the callback.
-  delete mCallback;
 }
 
 CallbackBase* SlotConnection::GetCallback()
@@ -60,6 +61,8 @@ SignalConnection::SignalConnection( SignalObserver* signalObserver, CallbackBase
 
 SignalConnection::~SignalConnection()
 {
+  // signal connections have ownership of the callback.
+  delete mCallback;
 }
 
 void SignalConnection::Disconnect( SlotObserver* slotObserver )
@@ -71,6 +74,8 @@ void SignalConnection::Disconnect( SlotObserver* slotObserver )
     mSignalObserver = NULL;
   }
 
+  // we own the callback, SignalObserver is expected to delete the SlotConnection on Disconnected so its pointer to our mCallback is no longer used
+  delete mCallback;
   mCallback = NULL;
 }