diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-03-18 09:37:22 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-03-18 09:37:22 +0000 |
| commit | 00f7de90210080e231b2f8c2a0bf39c8b0a048ac (patch) | |
| tree | a80c1ac3b852810fc4df35c08787bd2ec582d506 /plugins/SeenPlugin/src/utils.cpp | |
| parent | a03fab81e7d29d92d00c4268a8fa45e16ffd84dc (diff) | |
- major design flaw fixed in LastSeen plugin;
- version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@4089 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SeenPlugin/src/utils.cpp')
| -rw-r--r-- | plugins/SeenPlugin/src/utils.cpp | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp index 0fc11a7c90..8eb1f01f37 100644 --- a/plugins/SeenPlugin/src/utils.cpp +++ b/plugins/SeenPlugin/src/utils.cpp @@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void FileWrite(HANDLE);
void HistoryWrite(HANDLE hcontact);
+extern HANDLE g_hShutdownEvent;
char * courProtoName = 0;
/*
@@ -675,30 +676,31 @@ static void cleanThread(void *param) {
logthread_info* infoParam = (logthread_info*)param;
- Sleep(10000); // I hope in 10 secons all logged-in contacts will be listed
-
- HANDLE hcontact = db_find_first();
- while(hcontact != NULL) {
- char *contactProto = GetContactProto(hcontact);
- if (contactProto) {
- if ( !strncmp(infoParam->sProtoName, contactProto, MAXMODULELABELLENGTH)) {
- WORD oldStatus = db_get_w(hcontact,S_MOD,"StatusTriger",ID_STATUS_OFFLINE) | 0x8000;
- if (oldStatus > ID_STATUS_OFFLINE) {
- if (db_get_w(hcontact,contactProto,"Status",ID_STATUS_OFFLINE)==ID_STATUS_OFFLINE){
- db_set_w(hcontact,S_MOD,"OldStatus",(WORD)(oldStatus|0x8000));
- if (includeIdle)db_set_b(hcontact,S_MOD,"OldIdle",(BYTE)((oldStatus&0x8000)?0:1));
- db_set_w(hcontact,S_MOD,"StatusTriger",ID_STATUS_OFFLINE);
+ // I hope in 10 secons all logged-in contacts will be listed
+ if ( WaitForSingleObject(g_hShutdownEvent, 10000) == WAIT_TIMEOUT) {
+ HANDLE hcontact = db_find_first();
+ while(hcontact != NULL) {
+ char *contactProto = GetContactProto(hcontact);
+ if (contactProto) {
+ if ( !strncmp(infoParam->sProtoName, contactProto, MAXMODULELABELLENGTH)) {
+ WORD oldStatus = db_get_w(hcontact,S_MOD,"StatusTriger",ID_STATUS_OFFLINE) | 0x8000;
+ if (oldStatus > ID_STATUS_OFFLINE) {
+ if (db_get_w(hcontact,contactProto,"Status",ID_STATUS_OFFLINE)==ID_STATUS_OFFLINE){
+ db_set_w(hcontact,S_MOD,"OldStatus",(WORD)(oldStatus|0x8000));
+ if (includeIdle)db_set_b(hcontact,S_MOD,"OldIdle",(BYTE)((oldStatus&0x8000)?0:1));
+ db_set_w(hcontact,S_MOD,"StatusTriger",ID_STATUS_OFFLINE);
+ }
}
}
}
+ hcontact = db_find_next(hcontact);
}
- hcontact = db_find_next(hcontact);
- }
- char *str = (char *)malloc(MAXMODULELABELLENGTH+9);
- mir_snprintf(str,MAXMODULELABELLENGTH+8,"OffTime-%s",infoParam->sProtoName);
- db_unset(NULL,S_MOD,str);
- free(str);
+ char *str = (char *)malloc(MAXMODULELABELLENGTH+9);
+ mir_snprintf(str,MAXMODULELABELLENGTH+8,"OffTime-%s",infoParam->sProtoName);
+ db_unset(NULL,S_MOD,str);
+ free(str);
+ }
free(infoParam);
}
@@ -719,7 +721,7 @@ int ModeChange(WPARAM wparam,LPARAM lparam) if ((isetting>ID_STATUS_OFFLINE)&&((WORD)ack->hProcess<=ID_STATUS_OFFLINE)) {
//we have just loged-in
db_set_dw(NULL, "UserOnline", ack->szModule, GetTickCount());
- if (IsWatchedProtocol(ack->szModule)) {
+ if (!Miranda_Terminated() && IsWatchedProtocol(ack->szModule)) {
logthread_info *info = (logthread_info *)malloc(sizeof(logthread_info));
strncpy(info->sProtoName,courProtoName,MAXMODULELABELLENGTH);
info->hContact = 0;
|