1 files changed, 10 insertions, 5 deletions
diff --git a/Pages/ViewMedia.razor b/Pages/ViewMedia.razor
index fe73c7d..52300e3 100644
--- a/Pages/ViewMedia.razor
+++ b/Pages/ViewMedia.razor
@@ -106,9 +106,15 @@
 
     protected override void OnInitialized() {
         db = dbFactory.CreateDbContext();
-        media = db.Media.First(m => m.Guid == MediaId);
-        if(media is null)
-            throw new ArgumentException("Media not found!");
+        LoadMedia();
+    }
+
+    private void LoadMedia() {
+        media = db.Media
+            .Include(m => m.Tags)
+            .ThenInclude(t => t.TagDefinition)
+            .Include(m => m.UploadedFiles)
+            .First(m => m.Guid == MediaId);
 
         title = media.DisplayName ?? "Media View";
     }
@@ -121,9 +127,8 @@
 
     private void SetIngest(bool ingest) {
         mediaService.SetIngest(media, ingest);
-        // TODO: fix this hacky method of reloading the media entity
         db.Entry(media).State = EntityState.Detached;
-        media = db.Media.First(m => m.Guid == media.Guid);
+        LoadMedia();
         StateHasChanged();
     }