merge

1 files changed, 5 insertions, 1 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 24c2602..f6cc8e4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -22,6 +22,7 @@ var Scenery = new function(){
 			case 'video':
 			case 'youtube':
 			case 'vimeo':
+			  if (is_mobile) return
 				scene_media = new Scenery.types.video (opt)
 				break
 			
@@ -39,7 +40,10 @@ var Scenery = new function(){
 		var scene_media = base.add(opt)
 		
 		// test if scenery was placed here
-		if (! scene_media.bounds) {
+		if (! scene_media) {
+		  return null
+		}
+		else if (! scene_media.bounds) {
 			base.remove( scene_media.id )
 			return null
 		}