Fix bug: "internal" services never properly registered that they had
authorDavin McCall <davmac@davmac.org>
Tue, 17 Nov 2015 18:58:22 +0000 (18:58 +0000)
committerDavin McCall <davmac@davmac.org>
Tue, 17 Nov 2015 18:58:22 +0000 (18:58 +0000)
stopped.

service.cc

index fd47212d4e46e3a67aabefde006f305d124ec774..78dbe57b3eaabf0a33761bab2bdf2e6358bed172 100644 (file)
@@ -383,9 +383,6 @@ bool ServiceRecord::start_ps_process(const std::vector<std::string> &pargs) noex
     }
 }
 
-
-
-
 // Mark this and all dependent services as force-stopped.
 void ServiceRecord::forceStop()
 {
@@ -507,10 +504,13 @@ void ServiceRecord::stopping()
             stopped();
         }
     }
-    else {
+    else if (service_type == ServiceType::SCRIPTED) {
         // Scripted service.
         start_ps_process(std::vector<string>(1, "stop"));
-    }    
+    }
+    else {
+        stopped();
+    }
 }
 
 void ServiceSet::service_active(ServiceRecord *sr)