Merged with Irssi 0.8.4 from irssi.org CVS.

[silc.git] / apps / irssi / src / core / servers.c

diff --git a/apps/irssi/src/core/servers.c b/apps/irssi/src/core/servers.c
index 2f3d15d1d22cb20ee6cfe0b0197dee932ba4ddd9..a5a8c701703005397fb2d62c5ca2451d85169420 100644 (file)
--- a/apps/irssi/src/core/servers.c
+++ b/apps/irssi/src/core/servers.c
@@ -198,8 +198,9 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
        } else {
                /* pick the one that was found, or if both do it like
                   /SET resolve_prefer_ipv6 says. */
-               ip = iprec.ip6.family != 0 &&
-                       settings_get_bool("resolve_prefer_ipv6") ?
+               ip = iprec.ip4.family == 0 ||
+                       (iprec.ip6.family != 0 &&
+                        settings_get_bool("resolve_prefer_ipv6")) ?
                        &iprec.ip6 : &iprec.ip4;
        }