Misc. cleanup

aaronpowell · Jul 2, 2019 · 2cab0a7 · 2cab0a7
1 parent a7b1c1d
commit 2cab0a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -13,7 +13,7 @@ async function activateProfile(
 ) {
   let msg = vscode.window.setStatusBarMessage("Switching profiles.");
 
-  config.setCurrentProfile(profile);
+  await config.setCurrentProfile(profile);
 
   let profileSettings = config.getProfileSettings(profile);
   await settingsHelper.updateUserSettings(profileSettings);

diff --git a/src/services/config.ts b/src/services/config.ts
@@ -42,12 +42,12 @@ class Config {
     return config.update(ConfigLiveShareProfileKey, profile, vscode.ConfigurationTarget.Global);
   }
 
-  public setCurrentProfile(profile: string) {
+  public async setCurrentProfile(profile: string) {
     if (this.context) {
       const previousProfile = this.context.globalState.get<string>(ContextSettingCurrentProfile);
       this.setPreviousProfile(previousProfile);
 
-      this.context.globalState.update(ContextSettingCurrentProfile, profile);
+      await this.context.globalState.update(ContextSettingCurrentProfile, profile);
     }
   }
 

diff --git a/src/services/liveShare.ts b/src/services/liveShare.ts
@@ -12,17 +12,12 @@ export async function initialize(
         return;
     }
 
-    const liveShareProfile = config.getLiveShareProfile();
-    if (!liveShareProfile) {
-        return;
-    }
-
-    // Check to see whether there was a lingering profile set
-    // (e.g. because the user closed VS Code while in a Live Share
-    // session), and if so, restore the right profile.
-    restorePreviousProfile(config, activateProfileHandler);
-
     liveShare.onDidChangeSession(e => {
+        const liveShareProfile = config.getLiveShareProfile();
+        if (!liveShareProfile) {
+            return;
+        }
+
         if (e.session.id) {
             activateProfileHandler(liveShareProfile);
         } else {