4 files changed, 5 insertions, 24 deletions

diff --git a/client/src/app/+video-studio/edit/index.ts b/client/src/app/+video-studio/edit/index.ts
index ff1d77fc0..15b57e1c8 100644
--- a/client/src/app/+video-studio/edit/index.ts
+++ b/client/src/app/+video-studio/edit/index.ts
@@ -1,2 +1 @@
 export * from './video-studio-edit.component'
-export * from './video-studio-edit.resolver'
diff --git a/client/src/app/+video-studio/edit/video-studio-edit.resolver.ts b/client/src/app/+video-studio/edit/video-studio-edit.resolver.ts
deleted file mode 100644
index c658be50b..000000000
--- a/client/src/app/+video-studio/edit/video-studio-edit.resolver.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-
-import { Injectable } from '@angular/core'
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
-import { VideoService } from '@app/shared/shared-main'
-
-@Injectable()
-export class VideoStudioEditResolver implements Resolve<any> {
-  constructor (
-    private videoService: VideoService
-  ) {
-  }
-
-  resolve (route: ActivatedRouteSnapshot) {
-    const videoId: string = route.params['videoId']
-
-    return this.videoService.getVideo({ videoId })
-  }
-}
diff --git a/client/src/app/+video-studio/video-studio-routing.module.ts b/client/src/app/+video-studio/video-studio-routing.module.ts
index bcd9b79a5..4c08631a1 100644
--- a/client/src/app/+video-studio/video-studio-routing.module.ts
+++ b/client/src/app/+video-studio/video-studio-routing.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
-import { VideoStudioEditComponent, VideoStudioEditResolver } from './edit'
+import { VideoResolver } from '@app/shared/shared-main'
+import { VideoStudioEditComponent } from './edit'
 
 const videoStudioRoutes: Routes = [
   {
@@ -15,7 +16,7 @@ const videoStudioRoutes: Routes = [
           }
         },
         resolve: {
-          video: VideoStudioEditResolver
+          video: VideoResolver
         }
       }
     ]
diff --git a/client/src/app/+video-studio/video-studio.module.ts b/client/src/app/+video-studio/video-studio.module.ts
index 1a8763539..7c1dc02ea 100644
--- a/client/src/app/+video-studio/video-studio.module.ts
+++ b/client/src/app/+video-studio/video-studio.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core'
 import { SharedFormModule } from '@app/shared/shared-forms'
 import { SharedMainModule } from '@app/shared/shared-main'
-import { VideoStudioEditComponent, VideoStudioEditResolver } from './edit'
+import { VideoStudioEditComponent } from './edit'
 import { VideoStudioService } from './shared'
 import { VideoStudioRoutingModule } from './video-studio-routing.module'
 
@@ -20,8 +20,7 @@ import { VideoStudioRoutingModule } from './video-studio-routing.module'
   exports: [],
 
   providers: [
-    VideoStudioService,
-    VideoStudioEditResolver
+    VideoStudioService
   ]
 })
 export class VideoStudioModule { }