From a289cfb98695e9e72b86f247f814ff92ff14a683 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 12 May 2015 09:48:03 +0200 Subject: [PATCH] Only restart global discovery on UPnP change if it was enabled to start with (fixes #1799) --- cmd/syncthing/upnpsvc.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/syncthing/upnpsvc.go b/cmd/syncthing/upnpsvc.go index efb4c520e..ddba9b858 100644 --- a/cmd/syncthing/upnpsvc.go +++ b/cmd/syncthing/upnpsvc.go @@ -79,8 +79,10 @@ func (s *upnpSvc) tryIGDs(igds []upnp.IGD, prevExtPort int) int { // External port changed; refresh the discovery announcement. // TODO: Don't reach out to some magic global here? l.Infof("New UPnP port mapping: external port %d to local port %d.", extPort, s.localPort) - discoverer.StopGlobal() - discoverer.StartGlobal(s.cfg.Options().GlobalAnnServers, uint16(extPort)) + if s.cfg.Options().GlobalAnnEnabled { + discoverer.StopGlobal() + discoverer.StartGlobal(s.cfg.Options().GlobalAnnServers, uint16(extPort)) + } } if debugNet { l.Debugf("Created/updated UPnP port mapping for external port %d on device %s.", extPort, igd.FriendlyIdentifier())