Author: ygrego Date: 2015-04-01 13:32:25 +0000 (Wed, 01 Apr 2015) New Revision: 1019 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1019 Log: In method "setChannel" ask a state changement when state different of UNREALIZED and channel to switch equals to null. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-01 13:18:04 UTC (rev 1018) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-01 13:32:25 UTC (rev 1019) @@ -651,16 +651,17 @@ .then(this.changeStateToConnectingWhenSwitching.bind(this, channel)); } else if (channel.idType == 40 || channel.idType == 41) { - this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 8]))); - } else { - this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 0]))); - } + this._timeout() + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 8]))); + } else { + this._timeout() + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 0]))); + } } else { - - this._timeout() - .then(this.changePlayState.bind(this, this._UNREALIZED)); + if (this.playState != this._UNREALIZED) { + this._timeout() + .then(this.changePlayState.bind(this, this._UNREALIZED)); + } } },