diff options
| author | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-06-01 19:22:41 +0000 |
|---|---|---|
| committer | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-06-01 19:22:41 +0000 |
| commit | d8642972d987d97ac4e1718e96666dae931447d2 (patch) | |
| tree | 2252abc5aa8f706db6ebff32f20a3f7ad885ff02 | |
| parent | 9b26a0dc0976c6bc31bfcaee4c25ef008984be8b (diff) | |
Fixed db-mergers handling of bot collisions
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2993 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | src/tools/db-merger.c | 3 | ||||
| -rw-r--r-- | version.log | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c index 547b82e04..0a5050b8c 100644 --- a/src/tools/db-merger.c +++ b/src/tools/db-merger.c @@ -1464,7 +1464,8 @@ int main(int argc, char *argv[]) goto waiting_for_input3; } } /* NO COLLISION (biptr) */ - insert_bot(bi); + else + insert_bot(bi); } } else nobot = 1; diff --git a/version.log b/version.log index 23516c1ee..736811f08 100644 --- a/version.log +++ b/version.log @@ -9,9 +9,10 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="4" VERSION_EXTRA="-svn" -VERSION_BUILD="2991" +VERSION_BUILD="2993" # $Log$ # Changes since the 1.8.4 Release +#Revision 2993 - Fixed db-mergers handling of bot collisions #Revision 2991 - Fixed a crash on shutdown when running Anope on Mac #Revision 2981 - Fixed SQUITing juped servers on InspIRCd 1.2 #Revision 2978 - Added param to EVENT_CHANGE_NICK for old nickname |