fixes #5210 (#5252)

dataplat · Mar 19, 2019 · 0f8805f · 0f8805f
1 parent 026e6c1
commit 0f8805f
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/functions/Remove-DbaDatabaseSafely.ps1 b/functions/Remove-DbaDatabaseSafely.ps1
@@ -198,22 +198,26 @@ function Remove-DbaDatabaseSafely {
                 $serviceName = 'MSSQLSERVER'
             } else {
                 $instance = $destserver.InstanceName
-                if ($instance.length -eq 0) { $instance = "MSSQLSERVER" }
-                $serviceName = "SQL Server Agent ($instance)"
+                if ($instance.length -eq 0) {
+                    $instance = "MSSQLSERVER"
+                    $serviceName = "SQLSERVERAGENT"
+                } else {
+                    $serviceName = "SQLAgent`$$($instance)"
+                }
             }
 
             if ($Pscmdlet.ShouldProcess($destination, "Starting Sql Agent")) {
                 try {
                     $ipaddr = Resolve-SqlIpAddress $destserver
-                    $agentservice = Get-Service -ComputerName $ipaddr -DisplayName $serviceName
+                    $agentservice = Get-Service -ComputerName $ipaddr -Name $serviceName
 
                     if ($agentservice.Status -ne 'Running') {
                         $agentservice.Start()
                         $timeout = New-Timespan -seconds 60
                         $sw = [diagnostics.stopwatch]::StartNew()
-                        $agentstatus = (Get-Service -ComputerName $ipaddr -DisplayName $serviceName).Status
+                        $agentstatus = (Get-Service -ComputerName $ipaddr -Name $serviceName).Status
                         while ($AgentStatus -ne 'Running' -and $sw.elapsed -lt $timeout) {
-                            $agentStatus = (Get-Service -ComputerName $ipaddr -DisplayName $serviceName).Status
+                            $agentStatus = (Get-Service -ComputerName $ipaddr -Name $serviceName).Status
                         }
                     }
                 }