Merge pull request #160 from my-flow/master

Handle empty Vimeo lists gracefully (fix NPE)
christianvuerings · Jan 25, 2014 · d47a8a4 · d47a8a4
2 parents 2740a1f + cd3a7a2
commit d47a8a4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/services/vimeo.js b/src/services/vimeo.js
@@ -53,14 +53,16 @@ $.fn.lifestream.feeds.vimeo = function( config, callback ) {
       var output = [];
 
       // check for likes & parse
-      if ( response.query.results.videos[0].video.length > 0 ) {
+      if ( response.query.results.videos[0] != null &&
+           response.query.results.videos[0].video.length > 0 ) {
         output = output.concat(parseVimeo(
           response.query.results.videos[0].video
         ));
       }
 
       // check for uploads & parse
-      if ( response.query.results.videos[1].video.length > 0 ) {
+      if ( response.query.results.videos[1] != null &&
+           response.query.results.videos[1].video.length > 0 ) {
         output = output.concat(
           parseVimeo(response.query.results.videos[1].video, 'posted')
         );