Merge pull request #81 from CYKEB/RegexFix

Fixed bug in withNameRegex and firstWithNameRegex when name is null
vkolgi · Nov 27, 2014 · d8d73da · d8d73da
2 parents 94519f5 + be011c2
commit d8d73da
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/uiautomation-ext.js b/uiautomation-ext.js
@@ -35,7 +35,7 @@ extend(UIAElementArray.prototype, {
     var ret = [];
     for (var i = 0; i < this.length; ++i) {
       var elem = this[i];
-      if (elem.isNotNil && elem.isNotNil() && elem.name().match(pattern) !== null) {
+      if (elem.isNotNil && elem.isNotNil() && elem.name() && elem.name().match(pattern) !== null) {
         ret.push(elem);
       }
     }
@@ -48,7 +48,7 @@ extend(UIAElementArray.prototype, {
   firstWithNameRegex: function(pattern) {
     for (var i = 0; i < this.length; ++i) {
       var elem = this[i];
-      if (elem.isNotNil && elem.isNotNil() && elem.name().match(pattern) !== null) return elem;
+      if (elem.isNotNil && elem.isNotNil() && elem.name() && elem.name().match(pattern) !== null) return elem;
     }
     return new UIAElementNil();
   }