From 580a72c4449c57cb743e09f44eeeb374cd00f172 Mon Sep 17 00:00:00 2001
From: David Banham
Date: Fri, 8 Mar 2013 11:51:58 +1100
Subject: Bring multiplex up to date

---
 plugin/multiplex/master.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugin/multiplex/master.js')

diff --git a/plugin/multiplex/master.js b/plugin/multiplex/master.js
index 3704fa4..a896244 100644
--- a/plugin/multiplex/master.js
+++ b/plugin/multiplex/master.js
@@ -1,6 +1,7 @@
 (function() {
 	// don't emit events from inside the previews themselves
 	if ( window.location.search.match( /receiver/gi ) ) { return; }
+	var multiplex = window.globals.multiplex;
 
 	var socket = io.connect(multiplex.url);
 	
@@ -27,6 +28,6 @@
 			socketId : multiplex.id
 		};
 
-		if( event.origin !== 'remote') socket.emit('slidechanged', slideData);
+		if( typeof event.origin === 'undefined' && event.origin !== 'remote') socket.emit('slidechanged', slideData);
 	} );
 }());
-- 
cgit v1.2.3