ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4798 from FinnStutzenstein/fixClos

Browse Source 
Fixed clos
This commit is contained in:
Emanuel Schütze 2019-06-19 12:04:09 +02:00 committed by GitHub
commit db3bf4de66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/site/projector/services/current-agenda-item.service.ts
View File

@ -7,7 +7,7 @@ import { ViewProjector } from '../models/view-projector';
import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service';
import { SlideManager } from 'app/slides/services/slide-manager.service'; import { SlideManager } from 'app/slides/services/slide-manager.service';
import { ViewListOfSpeakers } from 'app/site/agenda/models/view-list-of-speakers'; import { ViewListOfSpeakers } from 'app/site/agenda/models/view-list-of-speakers';
import { BaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers'; import { isBaseViewModelWithListOfSpeakers } from 'app/site/base/base-view-model-with-list-of-speakers';
/** /**
* Observes the projector config for a given projector and returns a observable of the * Observes the projector config for a given projector and returns a observable of the
@ -62,7 +62,7 @@ export class CurrentListOfSpeakersService {
const nonStableElement = this.slideManager.getIdentifialbeProjectorElement(nonStableElements[0]); // The normal case is just one non stable slide const nonStableElement = this.slideManager.getIdentifialbeProjectorElement(nonStableElements[0]); // The normal case is just one non stable slide
try { try {
const viewModel = this.projectorService.getViewModelFromProjectorElement(nonStableElement); const viewModel = this.projectorService.getViewModelFromProjectorElement(nonStableElement);
if (viewModel instanceof BaseViewModelWithListOfSpeakers) { if (isBaseViewModelWithListOfSpeakers(viewModel)) {
return viewModel.listOfSpeakers; return viewModel.listOfSpeakers;
} }
} catch (e) { } catch (e) {