diff --git a/src/app/admin/dashboard/dashboard.component.html b/src/app/admin/dashboard/dashboard.component.html index 4c7539e..90fcc62 100644 --- a/src/app/admin/dashboard/dashboard.component.html +++ b/src/app/admin/dashboard/dashboard.component.html @@ -2,7 +2,7 @@

Dashboard

- +
Start slideshow
diff --git a/src/app/shared/service/timer.service.ts b/src/app/shared/service/timer.service.ts index b2a972f..0443a7c 100644 --- a/src/app/shared/service/timer.service.ts +++ b/src/app/shared/service/timer.service.ts @@ -4,7 +4,7 @@ import { SettingsService } from './settings.service'; import { SelfUpdaterService } from './self-updater.service'; import { TimerObservable } from 'rxjs/observable/TimerObservable'; import { Subscription } from 'rxjs/Subscription'; -import { ActivationEnd, Router } from '@angular/router'; +import { ActivationStart, Router } from '@angular/router'; import { SlideShowService } from '../../display/slide-show.service'; import 'rxjs/add/operator/filter'; import 'rxjs/add/operator/switchMap'; @@ -35,8 +35,8 @@ export class TimerService implements OnDestroy { this.autoSwitch = false; this.router.events - .filter(event => event instanceof ActivationEnd) - .subscribe((event: ActivationEnd) => this.autoSwitch = !!event.snapshot.data.autoSwitchable); + .filter(event => event instanceof ActivationStart) + .subscribe((event: ActivationStart) => this.autoSwitch = !!event.snapshot.data.autoSwitchable); this.slideIntervalSubscription = this.settings.slideIntervalChanged.subscribe( interval => this.setSlideTimer(interval)