Merge remote-tracking branch 'origin/master'

2017-02-28 16:53:57 -05:00 · 2017-02-28 16:53:57 -05:00 · 463dedb0ac
parent 6b0255aee3 ee4506b8f0
commit 463dedb0ac
2 changed files with 1152 additions and 10222 deletions
--- a/PowerShell/BloodHound.ps1
+++ b/PowerShell/BloodHound.ps1
--- a/src/components/Graph.jsx
+++ b/src/components/Graph.jsx
@ -769,7 +769,7 @@ export default class GraphContainer extends Component {
        dagreListener.bind('stop', function(event){
            var needsfix = false;
            sigmaInstance.graph.nodes().forEach(function(node) {
-                if (isNaN(node.x)){
+                if (isNaN(node.x) || isNaN(node.y)){
                    emitter.emit('updateLoadingText', "Fixing Overlap");
                    sigmaInstance.startNoverlap();
                    needsfix = true;