X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcommon%2Ftimers.cpp;h=bf334bf8a0453ebc89fb566e5df62329bbcb57a2;hb=be85301ffda484bcfc0c0576f467a6f56f2f2bb6;hp=3f0b18151306cacab8104a434cfb928cdb1cbf03;hpb=87b1ab30b0f67dfa0457f9e946757d83cfb25106;p=xestiaab%2F.git
diff --git a/source/common/timers.cpp b/source/common/timers.cpp
index 3f0b181..bf334bf 100644
--- a/source/common/timers.cpp
+++ b/source/common/timers.cpp
@@ -16,7 +16,7 @@
// You should have received a copy of the GNU General Public License along
// with Xestia Address Book. If not, see
-#include "../frmActivityMgr.h"
+#include "../actmgr/frmActivityMgr.h"
#include "../frmContact.h"
#include "../frmMain.h"
#include
@@ -313,6 +313,12 @@ void wxActListProcTimer::Notify(){
ActListFinDTPtr->insert(std::make_pair(iter->first, adt));
+ // Delete the connection object.
+
+ std::map::iterator ConnObject = ActListConnPtr->find(iter->first);
+ delete ConnObject->second;
+ ConnObject->second = NULL;
+
}
if (ClearupProcessed == TRUE){
@@ -342,7 +348,7 @@ void wxActListProcTimer::SetupPointers(std::map *ActList, std::map *ActListDetail, bool *TasksActive,
wxListCtrl *lstActivity, wxStaticText *lblDetails, wxGauge *GauProgress,
void *ActMgr, wxActTimer *ActTimer, wxActProcessTimer *ActProcessTimer,
- std::map *ActListFinDT){
+ std::map *ActListFinDT, std::map *ActListConn){
ActListPtr = ActList;
ActListUIPtr = ActListUI;
@@ -355,6 +361,7 @@ void wxActListProcTimer::SetupPointers(std::map *ActList, std::map