Changeset 6376

Show
Ignore:
Timestamp:
07/01/08 06:37:04 (2 months ago)
Author:
flynd
Message:

Use the new DropOwner? function to properly specify which owner to unlock.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/email/src/forwarder.cpp

    r6168 r6376  
    120120  { 
    121121    unsigned long s = StringToStatus(m_szStatus); 
    122     ICQOwner *o = gUserManager.FetchOwner(LOCK_R); 
     122    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R); 
    123123    bool b = o->StatusOffline(); 
    124     gUserManager.DropOwner(); 
     124    gUserManager.DropOwner(o); 
    125125    if (s == INT_MAX) 
    126126      gLog.Warn("%sInvalid startup status.\n", L_FORWARDxSTR); 
    … …  
    375375    ICQOwner *o = gUserManager.FetchOwner(nPPID, LOCK_R); 
    376376    sprintf(szTo, "To: %s <%s>", o->GetAlias(), m_szSMTPTo); 
    377     gUserManager.DropOwner(nPPID); 
     377    gUserManager.DropOwner(o); 
    378378    if (nPPID == LICQ_PPID) 
    379379      sprintf (szFrom, "From: \"%s\" <%s@pager.icq.com>", u->GetAlias(), u->IdString());