From 4fb57eb4c14191a512f44bd514cd1682e79b1010 Mon Sep 17 00:00:00 2001
From: Jeff Morgan <jmorganca@gmail.com>
Date: Fri, 12 Sep 2014 02:12:20 -0700
Subject: [PATCH] Fixing breaking bug if old version of virtualbox is
 installed.

---
 index.js                                            | 10 ++--------
 meteor/client/lib/installer.js                      |  4 ++--
 meteor/client/views/dashboard/setup/setup-finish.js |  2 ++
 package.json                                        |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/index.js b/index.js
index a838b66b49..96c7fcf198 100644
--- a/index.js
+++ b/index.js
@@ -112,7 +112,7 @@ app.on('activate-with-no-open-windows', function () {
 app.on('ready', function() {
   start(function (url, nodeChild, mongoChild) {
     var cleanUpChildren = function () {
-      console.log('Cleaning up children.')
+      console.log('Cleaning up children.');
       mongoChild.kill();
       nodeChild.kill();
       app.quit();
@@ -137,13 +137,7 @@ app.on('ready', function() {
       }
     };
     mainWindow = new BrowserWindow(windowOptions);
-
-    // and load the index.html of the app.
+    mainWindow.focus();
     mainWindow.loadUrl(url);
-
-    mainWindow.webContents.on('did-finish-load', function () {
-      mainWindow.show();
-      mainWindow.focus();
-    });
   });
 });
diff --git a/meteor/client/lib/installer.js b/meteor/client/lib/installer.js
index e4b6ddaaac..3c5589527f 100644
--- a/meteor/client/lib/installer.js
+++ b/meteor/client/lib/installer.js
@@ -55,9 +55,9 @@ Installer.steps = [
                     callback(err);
                   }
                 });
-              }, function (progress) {
-                progressCallback(progress);
               });
+            }, function (progress) {
+              progressCallback(progress);
             });
           } else {
             callback();
diff --git a/meteor/client/views/dashboard/setup/setup-finish.js b/meteor/client/views/dashboard/setup/setup-finish.js
index 8d4abf2533..05dce0cccd 100644
--- a/meteor/client/views/dashboard/setup/setup-finish.js
+++ b/meteor/client/views/dashboard/setup/setup-finish.js
@@ -1,6 +1,8 @@
 Template.setup_finish.events({
   'click .finish-button': function (e) {
     var enableDiagnostics = $('.install-diagonistics input').attr('checked') ? true : false;
+    var status = enableDiagnostics ? 'on' : 'off';
+    ga('send', 'event', 'link', 'click', 'turn ' + status + ' usage analytics');
     Installs.insert({version: Installer.CURRENT_VERSION});
     var settings = Settings.findOne();
     if (!settings) {
diff --git a/package.json b/package.json
index 4e960224c0..350f38645d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Kitematic",
   "main": "index.js",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "dependencies": {
     "async": "^0.9.0",
     "chokidar": "git+https://github.com/usekite/chokidar.git",