bugfixes

mkloubert · Dec 1, 2017 · a2df24b · a2df24b
1 parent 9da8f09
commit a2df24b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log (vs-deploy)
 
+## 12.0.2 (December 1st, 2017; bugfixes)
+
+* bugfixes
+
 ## 12.0.1 (November 27th, 2017; switch target, multi root support and module updates)
 
 * added `autoSelectWorkspace` setting, which can select the current workspace by active text editor automatically

diff --git a/img/screenshot1.png b/img/screenshot1.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vs-deploy",
   "displayName": "Deploy",
   "description": "Commands for deploying files of your workspace to a destination.",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "publisher": "mkloubert",
   "engines": {
     "vscode": "^1.18.0"

diff --git a/src/deploy.ts b/src/deploy.ts
@@ -2371,9 +2371,13 @@ export class Deployer extends Events.EventEmitter implements vscode.Disposable {
 
         const AUTO_SELECT_WORKSPACE_COMPLETED = (err: any) => {
             if (err) {
+                let errMsg = i18.t('workspace.autoSelect.failed', err);
+                if (deploy_helpers.isEmptyString(errMsg)) {
+                    errMsg = `Could not auto-select workspace: '${deploy_helpers.toStringSafe(err)}'`;
+                }
+
                 vscode.window
-                      .showWarningMessage('[vs-deploy] ' + i18.t('workspace.autoSelect.failed',
-                                                                 err));
+                      .showWarningMessage('[vs-deploy] ' + errMsg);
             }
         };