Skip to content
This repository has been archived by the owner on Jun 11, 2021. It is now read-only.

Commit

Permalink
Updated wording for VM pref and vm selection (#2735)
Browse files Browse the repository at this point in the history
Signed-off-by: French Ben <frenchben@docker.com>
  • Loading branch information
FrenchBen committed Jun 14, 2017
1 parent 0e5842f commit ab96cc9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 0 additions & 2 deletions src/components/Preferences.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ var Preferences = React.createClass({
metrics.track('Toggled VM or Native settting', {
vm: checked
});
this.transitionTo('loading');
remote.getCurrentWindow().reload();
},
handleChangeMetricsEnabled: function (e) {
var checked = e.target.checked;
Expand Down
6 changes: 3 additions & 3 deletions src/utils/SetupUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ export default {
virtualBoxVersion,
machineVersion
});

let exists
if (process.env.MACHINE_STORAGE_PATH) {
let exists = await virtualBox.vmExists(machine.name()) && fs.existsSync(path.join(process.env.MACHINE_STORAGE_PATH, 'machines', machine.name()));
exists = await virtualBox.vmExists(machine.name()) && fs.existsSync(path.join(process.env.MACHINE_STORAGE_PATH, 'machines', machine.name()));
} else {
let exists = await virtualBox.vmExists(machine.name()) && fs.existsSync(path.join(util.home(), '.docker', 'machine', 'machines', machine.name()));
exists = await virtualBox.vmExists(machine.name()) && fs.existsSync(path.join(util.home(), '.docker', 'machine', 'machines', machine.name()));
}
if (!exists) {
router.get().transitionTo('setup');
Expand Down

0 comments on commit ab96cc9

Please sign in to comment.