fix: fix sygotchi object being null

Sybit-Education · Aug 2, 2023 · 57bdd18 · 57bdd18
1 parent f65f00b
commit 57bdd18
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/app/show-sygotchi/show-sygotchi.component.ts b/src/app/show-sygotchi/show-sygotchi.component.ts
@@ -28,22 +28,20 @@ export class ShowSygotchiComponent implements OnInit {
 
     this.canvas = paper.project.activeLayer;
 
-    this.actionsService.getSygotchi().subscribe(result => {
+    this.canvas = paper.project.activeLayer;
+    this.store.select(selectSygotchi).subscribe(result => {
       this.sygotchi = result
-      this.store.select(selectSygotchi).subscribe(result => {
-        this.sygotchi = result
 
-        if (this.sygotchi === null) {
-          this.actionsService.getSygotchi().subscribe(result => {
-            this.sygotchi = result
-            this.store.dispatch(setSygotchi({ sygotchi: result as SyGotchi }))
-            this.buildSygotchi()
-          })
-        } else {
-          this.wsService.initializeWebSocketConnection(this.sygotchi.id)
+      if(this.sygotchi === null) {
+        this.actionsService.getSygotchi().subscribe(result => {
+          this.sygotchi = result
+          this.store.dispatch(setSygotchi({sygotchi: result as SyGotchi}))
           this.buildSygotchi()
-        }
-      })
+        })
+      } else {
+        this.wsService.initializeWebSocketConnection(this.sygotchi.id)
+        this.buildSygotchi()
+      }
     })
   }