Merge pull request #2389 from raszpl/patch-18

Update player.js reverting #2062, fixes #1342 #1652 #1904

js&css/web-accessible/www.youtube.com/player.js

@@ -39,11 +39,16 @@ ImprovedTube.autoplayDisable = function (videoElement) {
 FORCED PLAY VIDEO FROM THE BEGINNING
 ------------------------------------------------------------------------------*/
 ImprovedTube.forcedPlayVideoFromTheBeginning = function () {
-	if (this.storage.forced_play_video_from_the_beginning === true && document.documentElement.dataset.pageType === 'video' && !this.video_url.match(this.regex.video_time)?.[1]) {
-		this.elements.player.seekTo(0);
+	const player = this.elements.player,
+		video = this.elements.video,
+		paused = video?.paused;
+
+	if (player && video && this.storage.forced_play_video_from_the_beginning && location.pathname == '/watch') {
+		player.seekTo(0);
+		// restore previous paused state
+		if (paused) { player.pauseVideo(); }
 	}
 };
-
 /*------------------------------------------------------------------------------
 AUTOPAUSE WHEN SWITCHING TABS
 ------------------------------------------------------------------------------*/