[Erc-commit] [commit][emacs22] Fix active buffer issue that caused messages to go to the wrong place.

[mwolson]

commit 04dbf9ab3cccefc792be4bb47947ca5245c56613
Author: Michael Olson <address@hidden>
Date:   Thu Aug 3 02:35:02 2006 +0000

    Fix active buffer issue that caused messages to go to the wrong place.
    
    * erc.el (erc-active-buffer): Fix bug that caused messages to go to the
      wrong buffer.  Thanks to offby1 for the report.
    git-archimport-id: address@hidden/erc--main--0--patch-27

diff --git a/ChangeLog b/ChangeLog
index 9c94148..a59c842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-02  Michael Olson  <address@hidden>
+
+       * erc.el (erc-active-buffer): Fix bug that caused messages to go
+       to the wrong buffer.  Thanks to offby1 for the report.
+
 2006-07-29  Michael Olson  <address@hidden>
 
        * erc-log.el (erc-log-setup-logging): Don't offer to save the
diff --git a/erc.el b/erc.el
index 1d2cc5c..bfc8c9e 100644
--- a/erc.el
+++ b/erc.el
@@ -1392,8 +1392,8 @@ server buffer")
 Defaults to the server buffer."
   (with-current-buffer (erc-server-buffer)
     (if (buffer-live-p erc-active-buffer)
-       erc-active-buffer)
-    (setq erc-active-buffer (current-buffer))))
+       erc-active-buffer
+      (setq erc-active-buffer (current-buffer)))))
 
 (defun erc-set-active-buffer (buffer)
   "Set the value of `erc-active-buffer' to BUFFER."