From de8fed869422019df84a94605561597cfaaba547 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Thu, 8 Oct 2020 23:10:55 +0200
Subject: [PATCH] Fixing studio filter disabling & load from url

---
 src/app/components/items-grid/items-grid.component.html | 4 +++-
 src/app/components/items-grid/items-grid.component.ts   | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/components/items-grid/items-grid.component.html b/src/app/components/items-grid/items-grid.component.html
index 5b108cd2..a85f1b5e 100644
--- a/src/app/components/items-grid/items-grid.component.html
+++ b/src/app/components/items-grid/items-grid.component.html
@@ -30,7 +30,9 @@
 	<ng-container>
 		<mat-form-field class="w-100 px-3" (click)="$event.stopPropagation();">
 			<mat-label>Studio</mat-label>
-			<input type="text" matInput [matAutocomplete]="autoStudio" [formControl]="studioForm" placeholder="None">
+			<input type="text" matInput [formControl]="studioForm"
+			       [matAutocomplete]="autoStudio"
+			       [value]="this.nameGetter(this.filters.studio)">
 			<mat-autocomplete autoActiveFirstOption #autoStudio="matAutocomplete"
 			                  (optionSelected)="this.addFilter('studio', $event.option.value, false)"
 			                  [displayWith]="this.nameGetter">
diff --git a/src/app/components/items-grid/items-grid.component.ts b/src/app/components/items-grid/items-grid.component.ts
index 40d67200..43620690 100644
--- a/src/app/components/items-grid/items-grid.component.ts
+++ b/src/app/components/items-grid/items-grid.component.ts
@@ -94,7 +94,6 @@ export class ItemsGridComponent implements OnInit
 		}
 		else if (!slug)
 			this.filters.studio = null;
-		this.studioForm.setValue(this.filters.studio?.name ?? "None", {emitEvent: false});
 	}
 
 	updatePeopleFilterFromQuery(query: Params)
@@ -200,7 +199,7 @@ export class ItemsGridComponent implements OnInit
 		}
 		else
 		{
-			if (this.filters[category] == filter || this.filters[category]?.slug == filter.slug)
+			if (filter && (this.filters[category] == filter || this.filters[category]?.slug == filter.slug))
 			{
 				if (!toggle)
 					return;