← Back to branch summary

~ubuntu-branches/ubuntu/natty/znc/natty-backports

« back to all changes in this revision

Viewing changes to modules/stickychan.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Patrick Matthäi
  • Date: 2009-05-23 16:17:47 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090523161747-dtgbsub23o1sl7ss
Tags: 0.070-1
* New upstream release.
  - Add new pkgconfig files to znc-dev.
* Fix typo in get-orig-source target.
* Merge 0.058-2~bpo40+1 and 0.058-2~bpo40+2 changelog.
* Add recommends on the new source package znc-extra.
* Add my own copyright for the Debian packaging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/stickychan.cpp
86
86
                                pChan = new CChan(it->first, m_pUser, true);
87
87
                                if (!it->second.empty())
88
88
                                        pChan->SetKey(it->second);
89
 
                                m_pUser->AddChan(pChan);
 
89
                                if (!m_pUser->AddChan(pChan)) {
 
90
                                        /* AddChan() deleted that channel */
 
91
                                        PutModule("Could not join [" + it->first
 
92
                                                        + "] (# prefix missing?)");
 
93
                                        continue;
 
94
                                }
90
95
                        }
91
96
                        if (!pChan->IsOn()) {
92
97
                                PutModule("Joining [" + pChan->GetName() + "]");