Merge branch 'dev' into chrome-extension

appbaseio · Mar 20, 2017 · 4b86fd1 · 4b86fd1
2 parents 73722cd + 58aadba
commit 4b86fd1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/queryBlocks/queryBlocks.component.ts b/app/queryBlocks/queryBlocks.component.ts
@@ -72,7 +72,7 @@ export class QueryBlocksComponent implements OnInit, OnChanges {
 
 	ngOnChanges(nextProps) {
 		this.joiningQuery = this.result.joiningQuery;
-		if(nextProps.isAppbaseApp.currentValue) {
+		if(nextProps && (nextProps.isAppbaseApp && nextProps.isAppbaseApp.currentValue) || (nextProps.selectedTypes && nextProps.selectedTypes.currentValue.length)) {
 			this.setPopover();
 		}
 	}