X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Ftimers.cpp;h=6e49cab03045b9c3b5e91bf148de9c9c893836b5;hb=d6023ac2bba9572d1bca7da3d5960f6c07082624;hp=01849530fc4397fa73136962d21f7d32c49e1955;hpb=3c0a57e91bb919dd1c7bd0536278fb7753b8a77a;p=xestiaab%2F.git
diff --git a/source/common/timers.cpp b/source/common/timers.cpp
index 0184953..6e49cab 100644
--- a/source/common/timers.cpp
+++ b/source/common/timers.cpp
@@ -16,19 +16,7 @@
// You should have received a copy of the GNU General Public License along
// with Xestia Address Book. If not, see
-#include "../actmgr/frmActivityMgr.h"
-#include "../frmContact.h"
-#include "../frmMain.h"
-#include
-#include
-#include
-#include
-#include
-#include "../bitmaps.h"
-#include "../enums.h"
-#include "../common/preferences.h"
-#include "../common/etag.h"
-#include "../common/dirs.h"
+#include "timers.h"
void wxActTimer::Notify(){
@@ -297,7 +285,7 @@ void wxActListProcTimer::Notify(){
ueventdata->ItemLabel = _("Stopped");
wxPostEvent(static_cast(ActMgrPtr), uevent);
- iter->second = 5;
+ iter->second = 6;
} else if (iter->second == 4){
@@ -309,19 +297,24 @@ void wxActListProcTimer::Notify(){
}
+ // Delete the connection object if finished.
+
+ if (iter->second > 4){
+
+ std::map::iterator ConnObjectIter = ActListConnObjectsPtr->find(iter->first);
+
+ delete ConnObjectIter->second;
+ ConnObjectIter->second = nullptr;
+
+ }
+
// Insert a finish date.
wxDateTime adt;
adt = adt.Now();
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){
@@ -351,7 +344,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 *ActListConn){
+ std::map *ActListFinDT, std::map *ActListConnObjects){
// Setup the pointers for wxActListProcTimer.
@@ -366,7 +359,7 @@ void wxActListProcTimer::SetupPointers(std::map *ActList, std::map