From 9f741a440bcddd5d742fad65644a79c2663c6f52 Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 19 Nov 2015 11:02:25 -0800 Subject: [PATCH] Windows: [TP4] docker info crashes Signed-off-by: John Howard Upstream-commit: 37d2a7003864f8bdb5d8f6e3d9dcb4367fc94a6a Component: engine --- components/engine/daemon/network.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/engine/daemon/network.go b/components/engine/daemon/network.go index 4e2a76d35b..e1ac494b9b 100644 --- a/components/engine/daemon/network.go +++ b/components/engine/daemon/network.go @@ -152,6 +152,9 @@ func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, netwo func (daemon *Daemon) GetNetworkDriverList() map[string]bool { pluginList := make(map[string]bool) + if !daemon.NetworkControllerEnabled() { + return nil + } c := daemon.netController networks := c.Networks()