Merge branch 'master' of git://github.com/timonbandit/videojs-resolution-switcher into timonbandit-master

Conflicts:
	lib/videojs-resolution-switcher.js
This commit is contained in:
Kasper Moskwiak 2016-07-09 19:30:08 +02:00
commit dc22099421

View file

@ -162,7 +162,7 @@
var isPaused = player.paused(); var isPaused = player.paused();
// Hide bigPlayButton // Hide bigPlayButton
if(!isPaused){ if(!isPaused && this.player_.options_.bigPlayButton){
this.player_.bigPlayButton.hide(); this.player_.bigPlayButton.hide();
} }