From 80c06144f934c4d5e6d1d8de36fdd3e865c19e2d Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 13 May 2015 14:24:11 +0000
Subject: [PATCH] jsonalyzer calls initDB before checkInstall

---
 plugins/c9.vfs.extend/collab-server.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/c9.vfs.extend/collab-server.js b/plugins/c9.vfs.extend/collab-server.js
index 96da46a1..5693319a 100644
--- a/plugins/c9.vfs.extend/collab-server.js
+++ b/plugins/c9.vfs.extend/collab-server.js
@@ -52,16 +52,16 @@ function installServer(callback) {
         }
     }
 
-    if (!checkInstalled(getHomeDir() + "/.c9/node_modules/") && !checkInstalled("")) {
+    if (!Sequelize && !checkInstalled(getHomeDir() + "/.c9/node_modules/") && !checkInstalled("")) {
         var err = new Error("[vfs-collab] Couldn't load node modules sqlite3 and sequelize "
             + "from " + getHomeDir() + "/.c9/node_modules/; "
             + "node version: " + process.version + "; "
             + "node execPath " + process.execPath
             );
         err.code = "EFATAL";
-        return callback(err);
+        return callback && callback(err);
     }
-    callback();
+    callback && callback();
 }
 
 /**
@@ -90,6 +90,7 @@ function initDB(readonly, callback) {
     var MAX_LOG_LINE_LENGTH = 151;
 
     dbFilePath = dbFilePath || Path.join(getProjectWD(), "collab.db");
+    installServer();
     var sequelize = new Sequelize("c9-collab", "c9", "c9-collab-secret", {
         // the sql dialect of the database
         dialect: "sqlite",