From a7ded3325a13295add97b4fb327274873f65435b Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sat, 9 Sep 2023 17:12:49 -0500
Subject: [PATCH] warn user if we cannot play

---
 src/engine/engine.cpp | 8 ++++++--
 src/engine/engine.h   | 8 ++++----
 src/gui/gui.cpp       | 8 ++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index ad25b6eea..2e32f2408 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -1701,7 +1701,7 @@ unsigned int DivEngine::convertPanLinearToSplit(int val, unsigned char bits, int
   return (panL<<bits)|panR;
 }
 
-void DivEngine::play() {
+bool DivEngine::play() {
   BUSY_BEGIN_SOFT;
   curOrder=prevOrder;
   sPreview.sample=-1;
@@ -1788,10 +1788,12 @@ void DivEngine::play() {
     }
     output->midiOut->send(TAMidiMessage(TA_MIDI_MACHINE_PLAY,0,0));
   }
+  bool didItPlay=playing;
   BUSY_END;
+  return didItPlay;
 }
 
-void DivEngine::playToRow(int row) {
+bool DivEngine::playToRow(int row) {
   BUSY_BEGIN_SOFT;
   sPreview.sample=-1;
   sPreview.wave=-1;
@@ -1802,7 +1804,9 @@ void DivEngine::playToRow(int row) {
   for (int i=0; i<DIV_MAX_CHANS; i++) {
     keyHit[i]=false;
   }
+  bool didItPlay=playing;
   BUSY_END;
+  return didItPlay;
 }
 
 void DivEngine::stepOne(int row) {
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 2f323a5f4..1404a3a54 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -708,11 +708,11 @@ class DivEngine {
     // find song loop position
     void walkSong(int& loopOrder, int& loopRow, int& loopEnd);
 
-    // play
-    void play();
+    // play (returns whether successful)
+    bool play();
 
-    // play to row
-    void playToRow(int row);
+    // play to row (returns whether successful)
+    bool playToRow(int row);
 
     // play by one row
     void stepOne(int row);
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index af2d4458c..5dc3d5c36 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1105,9 +1105,13 @@ void FurnaceGUI::play(int row) {
   memset(lastIns,-1,sizeof(int)*DIV_MAX_CHANS);
   if (!followPattern) e->setOrder(curOrder);
   if (row>0) {
-    e->playToRow(row);
+    if (!e->playToRow(row)) {
+      showError("the song is over!");
+    }
   } else {
-    e->play();
+    if (!e->play()) {
+      showError("the song is over!");
+    }
   }
   curNibble=false;
   orderNibble=false;