From 5300bc363c5450b239d3fd7f0f6b5d521005b8a7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 5 Oct 2016 18:26:32 +0200
Subject: [PATCH] Fix a race condition in the slide application

---
 www/slide/main.js  | 4 ++--
 www/slide/slide.js | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/www/slide/main.js b/www/slide/main.js
index e30d9f6bb..a03fcdf93 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -32,7 +32,6 @@ define([
 
     module.spinner.show();
 
-    var ifrw = module.ifrw = $('#pad-iframe')[0].contentWindow;
     var stringify = function (obj) {
         return JSONSortify(obj);
     };
@@ -46,6 +45,7 @@ define([
     };
 
     $(function () {
+        var ifrw = module.ifrw = $('#pad-iframe')[0].contentWindow;
         var toolbar;
 
         var secret = Cryptpad.getSecrets();
@@ -126,7 +126,7 @@ define([
             var $modal = $pad.contents().find('#modal');
             var $content = $pad.contents().find('#content');
 
-            Slide.setModal($modal, $content, $pad);
+            Slide.setModal($modal, $content, $pad, ifrw);
 
             var enterPresentationMode = function (shouldLog) {
                 Slide.show(true, $textarea.val());
diff --git a/www/slide/slide.js b/www/slide/slide.js
index 4c68fd814..049ab96d7 100644
--- a/www/slide/slide.js
+++ b/www/slide/slide.js
@@ -14,14 +14,15 @@ define([
         content: [],
         changeHandlers: [],
     };
-    var ifrw = $('#pad-iframe')[0].contentWindow;
+    var ifrw;
     var $modal;
     var $content;
     var $pad;
-    Slide.setModal = function ($m, $c, $p) {
+    Slide.setModal = function ($m, $c, $p, iframe) {
         $modal = Slide.$modal = $m;
         $content = Slide.$content = $c;
         $pad = Slide.$pad = $p;
+        ifrw = Slide.ifrw = iframe;
     };
 
     Slide.onChange = function (f) {