###Scripts version 2037###

data_from_portwine/scripts/functions_helper

@@ -613,13 +613,13 @@ pw_kill_autostart () {
     if [ "$PW_USE_RUNTIME" != 1 ]
     then print_info "PW_USE_RUNTIME=$PW_USE_RUNTIME"
     else
-        sleep 10
+        sleep 10 
         while true ; do
-            if  [[ -z "`ps aux | grep -m 1 "$1" | grep -v grep | awk '{print $2}'`" && ! -z "`pgrep wrap | head -n 1`" ]] ; then
+            if  [[ -z "`ps aux | grep -m 1 "$1" | grep -v grep | awk '{print $2}'`" && ! -z "`ps aux | grep wrap | grep -v grep | grep -i ${portname} | head -n 1`" ]] ; then
                 echo -e "PID "$1" not found"
                 sleep 1
             else
-                kill_portwine &&
+                kill_portwine 
                 break
             fi
         done