# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 980594297 0
# Node ID 0137bacd63c8cb0a7261a0716d7623a184e855d9
# Parent  b4de935f820fd85c69d879864a0cf491e73d9d78
[gaim-migrate @ 1441]
bah

committer: Tailor Script <tailor@pidgin.im>

diff -r b4de935f820f -r 0137bacd63c8 src/conversation.c
--- a/src/conversation.c	Sat Jan 27 06:30:39 2001 +0000
+++ b/src/conversation.c	Sat Jan 27 11:18:17 2001 +0000
@@ -699,7 +699,7 @@
 	if (general_options & OPT_GEN_BACK_ON_IM) {
 		if (awaymessage != NULL) {
 			do_im_back();
-		} else {
+		} else if (c->gc->away) {
 			serv_set_away(c->gc, GAIM_AWAY_CUSTOM, NULL);
 		}
 	}