From 6902966b7d5d29f4ae499ac5b74e27b59fc28f5b Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Sat, 6 Oct 2012 12:40:36 +0100 Subject: [PATCH] Only set the BackendServerIP6 setting to ::1 by default if that address is available, otherwise leave it blank --- mythtv/programs/mythtv-setup/backendsettings.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mythtv/programs/mythtv-setup/backendsettings.cpp b/mythtv/programs/mythtv-setup/backendsettings.cpp index c10ad6f98bf..a52f0f344bb 100644 --- a/mythtv/programs/mythtv-setup/backendsettings.cpp +++ b/mythtv/programs/mythtv-setup/backendsettings.cpp @@ -27,7 +27,7 @@ static HostLineEdit *LocalServerIP6() { HostLineEdit *gc = new HostLineEdit("BackendServerIP6"); gc->setLabel(QObject::tr("IPv6 address")); - gc->setValue("::1"); + gc->setValue(""); gc->setHelpText(QObject::tr("Enter the IPv6 address of this machine. " "Use an externally accessible address (ie, not " "::1) if you are going to be running a frontend " @@ -36,7 +36,11 @@ static HostLineEdit *LocalServerIP6() gc->setEnabled(false); #else if (ServerPool::DefaultListenIPv6().isEmpty()) + { gc->setEnabled(false); + } + else if (ServerPool::DefaultListenIPv6().contains(QHostAddress("::1"))) + gc->setValue("::1"); #endif return gc; }