From 6e60c1d2e880c4dc531129b6ea10c43cc1fc7f66 Mon Sep 17 00:00:00 2001
From: Sebastian Hildebrandt <hildebrandt@plus-innovations.com>
Date: Fri, 16 Oct 2020 10:29:26 +0200
Subject: [PATCH] dockerContainers() resolved hanging issue

---
 CHANGELOG.md      | 1 +
 docs/history.html | 5 +++++
 docs/index.html   | 4 ++--
 lib/docker.js     | 3 +++
 lib/network.js    | 4 ++--
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 019a956..0e95ea8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 4.27.10        | 2020-10-16     | `dockerContainers()` resolved hanging issue |
 | 4.27.9         | 2020-10-13     | `networkInterfaces()` loopback internal detection (windows) |
 | 4.27.8         | 2020-10-08     | windows codepages partial fix |
 | 4.27.7         | 2020-10-05     | updated typescript typings, minor fixes |
diff --git a/docs/history.html b/docs/history.html
index 1e7f50c..05c9067 100644
--- a/docs/history.html
+++ b/docs/history.html
@@ -83,6 +83,11 @@
                   </tr>
                 </thead>
                 <tbody>
+                  <tr>
+                    <th scope="row">4.27.10</th>
+                    <td>2020-10-16</td>
+                    <td><span class="code">dockerContainers()</span> resolved hanging issue</td>
+                  </tr>
                   <tr>
                     <th scope="row">4.27.9</th>
                     <td>2020-10-13</td>
diff --git a/docs/index.html b/docs/index.html
index 510895e..1a843ac 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -168,7 +168,7 @@
       <img class="logo" src="assets/logo.png">
       <div class="title">systeminformation</div>
       <div class="subtitle"><span id="typed"></span></div>
-      <div class="version">Current Version: <span id="version">4.27.9</span></div>
+      <div class="version">Current Version: <span id="version">4.27.10</span></div>
       <button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
     </div>
     <div class="down">
@@ -207,7 +207,7 @@
         <div class="title">Downloads last month</div>
       </div>
       <div class="col-xl-4 col-lg-4 col-md-4 col-12">
-        <div class="numbers">352</div>
+        <div class="numbers">356</div>
         <div class="title">Dependends</div>
       </div>
     </div>
diff --git a/lib/docker.js b/lib/docker.js
index 22d69a3..271507b 100644
--- a/lib/docker.js
+++ b/lib/docker.js
@@ -162,6 +162,9 @@ function dockerContainers(all, callback) {
               if (callback) { callback(result); }
               resolve(result);
             }
+          } else {
+            if (callback) { callback(result); }
+            resolve(result);
           }
         } catch (err) {
           // GC in _docker_container_stats
diff --git a/lib/network.js b/lib/network.js
index e4dea69..e134ecd 100644
--- a/lib/network.js
+++ b/lib/network.js
@@ -745,7 +745,8 @@ function networkInterfaces(callback, rescan = true) {
           _ifaces = Object.assign({}, ifaces);
 
           if (_windows) {
-            getWindowsNics().forEach(nic => {
+            nics = getWindowsNics();
+            nics.forEach(nic => {
               let found = false;
               Object.keys(ifaces).forEach(key => {
                 if (!found) {
@@ -763,7 +764,6 @@ function networkInterfaces(callback, rescan = true) {
             });
 
             nics8021xInfo = getWindowsWiredProfilesInformation();
-            nics = getWindowsNics();
             dnsSuffixes = getWindowsDNSsuffixes();
           }
           if (_linux) {