docker-for-win: fix docker stop #106

x11docker

@@ -547,10 +547,6 @@ $(cat $Bgpidfile 2>/dev/null)"
               verbose -d "Container still running. Executing 'docker stop'."
               $Sudo $Dockerexe stop $Containername >>$Containerlogfile 2>&1 || verbose -d "docker stop failed"
             }
-            [ "$Winsubsystem" ] && $Dockerexe ps -a | grep -q $Containername && {
-              verbose -d "Container still running. Executing 'docker stop'."
-              $Dockerexe stop $Containername >>$Containerlogfile 2>&1 || verbose -d "docker stop failed"
-            }
           ;;
           *) # should never happen (tm)
             note "Found remaining background process $Line
@@ -600,15 +596,15 @@ $(ps -p $Pid)"
     }
   }
   # different stop behaviour on Windows because $Pid1pid is not in ps.
-  [ "$Winsubsystem" ] && [ "$Pid1pid" ] && [ "$Containername" ] && {
-    verbose -d "Stopping container $Containername"
-    $Sudo $Dockerexe stop $Containername >/dev/null 2>&1 || {
-      $Sudo $Dockerexe inspect $Containername >/dev/null 2>&1 && {
+  [ "$Winsubsystem" ] && [ "$Containername" ] && {
+    $Dockerexe ps -a | grep -q $Containername && {
+      verbose -d "Container still running. Executing 'docker stop'."
+      $Dockerexe stop $Containername >>$Containerlogfile 2>&1 || {
         warning "Failed to stop container $Containername.
   Will not clean cache to avoid file permission issues."
         Preservecachefiles="yes"
       }
-    }  
+    }
   }
 
   # check for possible error