From 968bd487b3c490931da51ed978587b3c5eabbc97 Mon Sep 17 00:00:00 2001
From: Aiden Vigue <acvigue@me.com>
Date: Thu, 10 Jun 2021 17:40:10 -0700
Subject: [PATCH] Auto stash before merge of "main" and "origin/main"

---
 JellyfinPlayer/VideoPlayer.swift | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/JellyfinPlayer/VideoPlayer.swift b/JellyfinPlayer/VideoPlayer.swift
index 6c89fdae..5f187423 100644
--- a/JellyfinPlayer/VideoPlayer.swift
+++ b/JellyfinPlayer/VideoPlayer.swift
@@ -381,14 +381,17 @@ class PlayerViewController: UIViewController, VLCMediaDelegate, VLCMediaPlayerDe
 
                     mediaPlayer.media = VLCMedia(url: playbackItem.videoUrl)
                     mediaPlayer.play()
-
-                    // 1 second = 10,000,000 ticks
-
-                    let startTicks = round(Double(manifest.userData?.playbackPositionTicks ?? 0), toNearest: 10_000_000)
-                    let startSeconds = Int32(startTicks) / 10_000_000
-                    mediaPlayer.jumpForward(startSeconds)
-
-                    // Pause and load captions into memory.
+                    
+                    //1 second = 10,000,000 ticks
+                    
+                    let rawStartTicks = manifest.userData?.playbackPositionTicks ?? 0
+                    
+                    if(rawStartTicks != 0) {
+                        let startSeconds = rawStartTicks / 10_000_000
+                        mediaPlayer.jumpForward(Int32(startSeconds))
+                    }
+                    
+                    //Pause and load captions into memory.
                     mediaPlayer.pause()
                     subtitleTrackArray.forEach { sub in
                         if sub.id != -1 && sub.delivery == .external && sub.codec != "subrip" {