X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=webapp%2Fsrc%2Fapp%2Fsdks%2FsdkSelectDropdown.component.ts;h=a2fe37ab06bd63494dabd7b0e758b158afa98379;hb=6691c9f7c53dc765b5a333a2db84ce692bd2b44d;hp=5122cd233e75b283ce943957d51f97a8a434f251;hpb=2c9ae6a5a27ae2f2e23495c613e7a53aed8e786c;p=src%2Fxds%2Fxds-server.git

diff --git a/webapp/src/app/sdks/sdkSelectDropdown.component.ts b/webapp/src/app/sdks/sdkSelectDropdown.component.ts
index 5122cd2..a2fe37a 100644
--- a/webapp/src/app/sdks/sdkSelectDropdown.component.ts
+++ b/webapp/src/app/sdks/sdkSelectDropdown.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from "@angular/core";
 
-import { ISdk, SdkService } from "../common/sdk.service";
+import { ISdk, SdkService } from "../services/sdk.service";
 
 @Component({
     selector: 'sdk-select-dropdown',
@@ -29,15 +29,19 @@ export class SdkSelectDropdownComponent {
     constructor(private sdkSvr: SdkService) { }
 
     ngOnInit() {
+        this.curSdk = this.sdkSvr.getCurrent();
         this.sdkSvr.Sdks$.subscribe((s) => {
-            this.sdks = s;
-            this.curSdk = this.sdks.length ? this.sdks[0] : null;
-            this.sdkSvr.setCurrent(this.curSdk);
+            if (s) {
+                this.sdks = s;
+                if (this.curSdk === null || s.indexOf(this.curSdk) === -1) {
+                    this.sdkSvr.setCurrent(this.curSdk = s.length ? s[0] : null);
+                }
+            }
         });
     }
 
     select(s) {
-         this.sdkSvr.setCurrent(this.curSdk = s);
+        this.sdkSvr.setCurrent(this.curSdk = s);
     }
 }