don't call the callback twice in case it fails

Conflicts: lib/mbtiles.js
2011-06-29 14:44:24 +02:00
parent b20f0937b8
commit 096408f44e
1 changed files with 3 additions and 2 deletions
--- a/lib/mbtiles.js
+++ b/lib/mbtiles.js
@@ -342,10 +342,11 @@ MBTiles.prototype.getGrid = function(z, x, y, callback) {
                        memo[r.key_name] = JSON.parse(r.key_json);
                        return memo;
                    }, {});
-                callback(null, _(JSON.parse(grid)).extend({ data: data }));
            } catch (err) {
-                callback(new Error('Grid is invalid'));
+                return callback(new Error('Grid is invalid'));
            }
+
+            callback(null, _(JSON.parse(grid)).extend({ data: data }));
        }
    );
 };