From d59962a8128fd9d0b43607100f4cb99e95747431 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 29 Jan 2021 10:49:27 -0800
Subject: [PATCH] Make SeekIfPossible a little more streamlined

---
 SabreTools.IO/StreamExtensions.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/SabreTools.IO/StreamExtensions.cs b/SabreTools.IO/StreamExtensions.cs
index f0456efc..e12d6e83 100644
--- a/SabreTools.IO/StreamExtensions.cs
+++ b/SabreTools.IO/StreamExtensions.cs
@@ -14,15 +14,21 @@ namespace SabreTools.IO
         /// <param name="offset">Optional offset to seek to</param>
         public static long SeekIfPossible(this Stream input, long offset = 0)
         {
+            // If the stream is null, don't even try
+            if (input == null)
+                return -1;
+            
+            // If the input is not seekable, just return the current position
+            if (!input.CanSeek)
+                return input.Position;
+
+            // Attempt to seek to the offset
             try
             {
-                if (input.CanSeek)
-                {
-                    if (offset < 0)
-                        return input.Seek(offset, SeekOrigin.End);
-                    else if (offset >= 0)
-                        return input.Seek(offset, SeekOrigin.Begin);
-                }
+                if (offset < 0)
+                    return input.Seek(offset, SeekOrigin.End);
+                else if (offset >= 0)
+                    return input.Seek(offset, SeekOrigin.Begin);
 
                 return input.Position;
             }