ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-10 13:46:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a9b7cb4ee1caac9a9ac1467848017b4cd9765d9e (#9589)

Browse Source
This commit is contained in:
Anthony Dresser
2020-03-12 18:48:45 -07:00
committed by GitHub
parent d87eebd6a5
commit 87b064aa7e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/platform/windows/electron-main/windowsMainService.ts
View File

@@ -457,8 +457,9 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
let foldersToRestore: URI[] = []; let foldersToRestore: URI[] = [];
let workspacesToRestore: IWorkspacePathToOpen[] = []; let workspacesToRestore: IWorkspacePathToOpen[] = [];
if (openConfig.initialStartup && !openConfig.cli.extensionDevelopmentPath && !openConfig.cli['disable-restore-windows']) { if (openConfig.initialStartup && !openConfig.cli.extensionDevelopmentPath && !openConfig.cli['disable-restore-windows']) {
let foldersToRestore = this.backupMainService.getFolderBackupPaths(); // don't restore backuped folders, for #92318.
foldersToOpen.push(...foldersToRestore.map(f => ({ folderUri: f, remoteAuhority: getRemoteAuthority(f) }))); // let foldersToRestore = this.backupMainService.getFolderBackupPaths();
// foldersToOpen.push(...foldersToRestore.map(f => ({ folderUri: f, remoteAuhority: getRemoteAuthority(f) })));
// collect from workspaces with hot-exit backups and from previous window session // collect from workspaces with hot-exit backups and from previous window session
workspacesToRestore = [...this.backupMainService.getWorkspaceBackups(), ...this.workspacesMainService.getUntitledWorkspacesSync()]; workspacesToRestore = [...this.backupMainService.getWorkspaceBackups(), ...this.workspacesMainService.getUntitledWorkspacesSync()];