Merge remote-tracking branch 'origin/develop' into develop

2017-12-06 22:54:43 +00:00 · 2017-12-06 22:54:43 +00:00 · c3d6ff1e3b
parent 2c95055aaa ed675fe791
commit c3d6ff1e3b
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@ -217,7 +217,7 @@ export default React.createClass({
        if (nextProps.url !== this.props.url) {
            this._getNewState(nextProps);
            this.setScalarToken();
-        } else if (nextProps.show && !this.props.show) {
+        } else if (nextProps.show && !this.props.show && this.props.waitForIframeLoad) {
            this.setState({
                loading: true,
            });