diff --git a/desktop/angular/src/app/layout/navigation/navigation.ts b/desktop/angular/src/app/layout/navigation/navigation.ts index 1cff5acb..46980ed4 100644 --- a/desktop/angular/src/app/layout/navigation/navigation.ts +++ b/desktop/angular/src/app/layout/navigation/navigation.ts @@ -313,9 +313,17 @@ export class NavigationComponent implements OnInit { event.preventDefault(); event.stopPropagation(); + let msg = 'Resuming ...'; + if (this.pauseState?.Interception===true && this.pauseState?.SPN===true) + msg = 'Resuming Portmaster and SPN ...'; + else if (this.pauseState?.Interception===true) + msg = 'Resuming Portmaster ...'; + else if (this.pauseState?.SPN===true) + msg = 'Resuming SPN ...'; + this.portapi.resume() .subscribe(this.actionIndicator.httpObserver( - 'Resuming ...', + msg, 'Failed to Resume', )) } diff --git a/service/control/pause.go b/service/control/pause.go index b3aa3480..7b07e1fc 100644 --- a/service/control/pause.go +++ b/service/control/pause.go @@ -204,7 +204,7 @@ func (c *Control) updateStatesAndNotify() { title = "SPN paused" nType = notifications.Info // less severe notification for SPN-only pause } - message := fmt.Sprintf("%s till %v", title, c.pauseInfo.TillTime.Format(time.TimeOnly)) + message := fmt.Sprintf("%s until %v", title, c.pauseInfo.TillTime.Format(time.TimeOnly)) c.pauseNotification = ¬ifications.Notification{ EventID: "control:paused",