From d901258f11431a2acade70b25dee365a0f4024d5 Mon Sep 17 00:00:00 2001
From: Madeline Schreiber <madelinemakesgames@gmail.com>
Date: Fri, 4 Jul 2025 16:47:29 -0400
Subject: [PATCH] GstEnginePipeline: Ignore about-to-finish when position is 0

---
 src/engine/gstenginepipeline.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp
index cd8500846..1999d1035 100644
--- a/src/engine/gstenginepipeline.cpp
+++ b/src/engine/gstenginepipeline.cpp
@@ -1369,6 +1369,12 @@ void GstEnginePipeline::AboutToFinishCallback(GstPlayBin *playbin, gpointer self
     qLog(Debug) << "Stream from URL" << instance->gst_url_ << "about to finish.";
   }
 
+  // When playing GME files it seems playbin3 emits about-to-finish early
+  // This stops us from skipping when the song has just started.
+  if (instance->position() == 0) {
+    return;
+  }
+
   instance->about_to_finish_ = true;
 
   if (instance->HasNextUrl() && !instance->next_uri_set_.value()) {