From: Jon K. <em...@us...> - 2004-11-18 14:21:17
|
Update of /cvsroot/licq/licq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12390 Modified Files: licq.cpp licq.h Log Message: Fix bug #1065442 Index: licq.cpp =================================================================== RCS file: /cvsroot/licq/licq/src/licq.cpp,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- licq.cpp 15 Nov 2004 10:40:00 -0000 1.85 +++ licq.cpp 18 Nov 2004 14:21:06 -0000 1.86 @@ -178,6 +178,7 @@ licqDaemon = NULL; pthread_mutex_init(&mutex_plugins, NULL); pthread_mutex_init(&mutex_protoplugins, NULL); + m_bDeletePID = true; //FIXME ICQ should be put into its own plugin. CProtoPlugin *p = new CProtoPlugin; @@ -318,6 +319,7 @@ gLog.Error(tr("%sLicq: Already running at pid %d.\n" "%s Kill process or remove %s.\n"), L_ERRORxSTR, pid, L_BLANKxSTR, szConf); + m_bDeletePID = false; return false; } } @@ -452,9 +454,12 @@ if (licqDaemon != NULL) delete licqDaemon; // Remove the lock file - char szConf[MAX_FILENAME_LEN]; - snprintf(szConf, MAX_FILENAME_LEN, "%s/licq.pid", BASE_DIR); - remove(szConf); + if (m_bDeletePID) + { + char szConf[MAX_FILENAME_LEN]; + snprintf(szConf, MAX_FILENAME_LEN, "%s/licq.pid", BASE_DIR); + remove(szConf); + } } Index: licq.h =================================================================== RCS file: /cvsroot/licq/licq/src/licq.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- licq.h 22 Sep 2004 14:27:24 -0000 1.13 +++ licq.h 18 Nov 2004 14:21:06 -0000 1.14 @@ -45,6 +45,7 @@ pthread_mutex_t mutex_plugins; ProtoPluginsList list_protoplugins; pthread_mutex_t mutex_protoplugins; + bool m_bDeletePID; friend class CICQDaemon; }; |