From c1e26ee749a2b618cf0845225a4d408599f700b3 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 19 Jan 2023 00:37:37 -0500
Subject: [PATCH] fix more possible crashes when deleting ins

and added a fatal error if implementation is missing
---
 src/engine/platform/abstract.cpp   | 4 +++-
 src/engine/platform/arcade.cpp     | 6 ++++++
 src/engine/platform/arcade.h       | 1 +
 src/engine/platform/dummy.cpp      | 4 ++++
 src/engine/platform/dummy.h        | 1 +
 src/engine/platform/genesis.h      | 2 +-
 src/engine/platform/genesisext.cpp | 7 +++++++
 src/engine/platform/genesisext.h   | 1 +
 src/engine/platform/msm6258.cpp    | 3 +++
 src/engine/platform/msm6295.cpp    | 3 +++
 src/engine/platform/opl.cpp        | 3 +++
 src/engine/platform/opll.cpp       | 3 +++
 src/engine/platform/qsound.cpp     | 6 +++---
 src/engine/platform/segapcm.cpp    | 6 ++++++
 src/engine/platform/segapcm.h      | 1 +
 src/engine/platform/tx81z.cpp      | 6 ++++++
 src/engine/platform/tx81z.h        | 1 +
 src/engine/platform/vera.cpp       | 2 +-
 src/engine/platform/ym2203.cpp     | 3 +++
 src/engine/platform/ym2203.h       | 2 +-
 src/engine/platform/ym2203ext.cpp  | 7 +++++++
 src/engine/platform/ym2203ext.h    | 1 +
 src/engine/platform/ym2608.cpp     | 6 ++++++
 src/engine/platform/ym2608.h       | 2 +-
 src/engine/platform/ym2608ext.cpp  | 7 +++++++
 src/engine/platform/ym2608ext.h    | 1 +
 src/engine/platform/ym2610.cpp     | 6 ++++++
 src/engine/platform/ym2610.h       | 2 +-
 src/engine/platform/ym2610b.cpp    | 6 ++++++
 src/engine/platform/ym2610b.h      | 2 +-
 src/engine/platform/ym2610bext.cpp | 7 +++++++
 src/engine/platform/ym2610bext.h   | 1 +
 src/engine/platform/ym2610ext.cpp  | 7 +++++++
 src/engine/platform/ym2610ext.h    | 1 +
 34 files changed, 111 insertions(+), 10 deletions(-)

diff --git a/src/engine/platform/abstract.cpp b/src/engine/platform/abstract.cpp
index 21415725..bd3efa72 100644
--- a/src/engine/platform/abstract.cpp
+++ b/src/engine/platform/abstract.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "../dispatch.h"
+#include "../../ta-log.h"
 
 void DivDispatch::acquire(short** buf, size_t len) {
 }
@@ -121,7 +122,8 @@ void DivDispatch::notifyWaveChange(int ins) {
 }
 
 void DivDispatch::notifyInsDeletion(void* ins) {
-
+  logE("notifyInsDeletion NOT implemented!");
+  abort();
 }
 
 void DivDispatch::notifyPlaybackStop() {
diff --git a/src/engine/platform/arcade.cpp b/src/engine/platform/arcade.cpp
index 1984e5a1..7251ef90 100644
--- a/src/engine/platform/arcade.cpp
+++ b/src/engine/platform/arcade.cpp
@@ -800,6 +800,12 @@ void DivPlatformArcade::notifyInsChange(int ins) {
   }
 }
 
+void DivPlatformArcade::notifyInsDeletion(void* ins) {
+  for (int i=0; i<8; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+}
+
 void* DivPlatformArcade::getChanState(int ch) {
   return &chan[ch];
 }
diff --git a/src/engine/platform/arcade.h b/src/engine/platform/arcade.h
index 0bbd9b2c..45c2e6b5 100644
--- a/src/engine/platform/arcade.h
+++ b/src/engine/platform/arcade.h
@@ -76,6 +76,7 @@ class DivPlatformArcade: public DivPlatformOPM {
     void muteChannel(int ch, bool mute);
     DivMacroInt* getChanMacroInt(int ch);
     void notifyInsChange(int ins);
+    void notifyInsDeletion(void* ins);
     void setFlags(const DivConfig& flags);
     int getOutputCount();
     void setYMFM(bool use);
diff --git a/src/engine/platform/dummy.cpp b/src/engine/platform/dummy.cpp
index 28cb5d40..42ce1ad5 100644
--- a/src/engine/platform/dummy.cpp
+++ b/src/engine/platform/dummy.cpp
@@ -131,6 +131,10 @@ int DivPlatformDummy::dispatch(DivCommand c) {
   return 1;
 }
 
+void DivPlatformDummy::notifyInsDeletion(void* ins) {
+  // nothing
+}
+
 void DivPlatformDummy::reset() {
   for (int i=0; i<chans; i++) {
     chan[i]=DivPlatformDummy::Channel();
diff --git a/src/engine/platform/dummy.h b/src/engine/platform/dummy.h
index c12d494b..0b7a480c 100644
--- a/src/engine/platform/dummy.h
+++ b/src/engine/platform/dummy.h
@@ -40,6 +40,7 @@ class DivPlatformDummy: public DivDispatch {
     void acquire(short** buf, size_t len);
     void muteChannel(int ch, bool mute);
     int dispatch(DivCommand c);
+    void notifyInsDeletion(void* ins);
     void* getChanState(int chan);
     DivDispatchOscBuffer* getOscBuffer(int chan);
     void reset();
diff --git a/src/engine/platform/genesis.h b/src/engine/platform/genesis.h
index 45517719..f3032cf9 100644
--- a/src/engine/platform/genesis.h
+++ b/src/engine/platform/genesis.h
@@ -118,7 +118,7 @@ class DivPlatformGenesis: public DivPlatformOPN {
     void toggleRegisterDump(bool enable);
     void setFlags(const DivConfig& flags);
     void notifyInsChange(int ins);
-    void notifyInsDeletion(void* ins);
+    virtual void notifyInsDeletion(void* ins);
     void setSoftPCM(bool value);
     int getPortaFloor(int ch);
     void poke(unsigned int addr, unsigned short val);
diff --git a/src/engine/platform/genesisext.cpp b/src/engine/platform/genesisext.cpp
index 8e1e7d12..4aa410af 100644
--- a/src/engine/platform/genesisext.cpp
+++ b/src/engine/platform/genesisext.cpp
@@ -746,6 +746,13 @@ void DivPlatformGenesisExt::notifyInsChange(int ins) {
   }
 }
 
+void DivPlatformGenesisExt::notifyInsDeletion(void* ins) {
+  DivPlatformGenesis::notifyInsDeletion(ins);
+  for (int i=0; i<4; i++) {
+    opChan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+}
+
 int DivPlatformGenesisExt::getPortaFloor(int ch) {
   return (ch>8)?12:0;
 }
diff --git a/src/engine/platform/genesisext.h b/src/engine/platform/genesisext.h
index 304f609f..67955adc 100644
--- a/src/engine/platform/genesisext.h
+++ b/src/engine/platform/genesisext.h
@@ -41,6 +41,7 @@ class DivPlatformGenesisExt: public DivPlatformGenesis {
     bool keyOffAffectsArp(int ch);
     bool keyOffAffectsPorta(int ch);
     void notifyInsChange(int ins);
+    void notifyInsDeletion(void* ins);
     int getPortaFloor(int ch);
     void setCSMChannel(unsigned char ch);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
diff --git a/src/engine/platform/msm6258.cpp b/src/engine/platform/msm6258.cpp
index af1472af..7814d23e 100644
--- a/src/engine/platform/msm6258.cpp
+++ b/src/engine/platform/msm6258.cpp
@@ -353,6 +353,9 @@ void DivPlatformMSM6258::notifyInsChange(int ins) {
 }
 
 void DivPlatformMSM6258::notifyInsDeletion(void* ins) {
+  for (int i=0; i<1; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
 }
 
 void DivPlatformMSM6258::setFlags(const DivConfig& flags) {
diff --git a/src/engine/platform/msm6295.cpp b/src/engine/platform/msm6295.cpp
index bc41091c..60842900 100644
--- a/src/engine/platform/msm6295.cpp
+++ b/src/engine/platform/msm6295.cpp
@@ -326,6 +326,9 @@ void DivPlatformMSM6295::notifyInsChange(int ins) {
 }
 
 void DivPlatformMSM6295::notifyInsDeletion(void* ins) {
+  for (int i=0; i<4; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
 }
 
 const void* DivPlatformMSM6295::getSampleMem(int index) {
diff --git a/src/engine/platform/opl.cpp b/src/engine/platform/opl.cpp
index 2c6c1590..855c56e1 100644
--- a/src/engine/platform/opl.cpp
+++ b/src/engine/platform/opl.cpp
@@ -1640,6 +1640,9 @@ void DivPlatformOPL::notifyInsChange(int ins) {
 }
 
 void DivPlatformOPL::notifyInsDeletion(void* ins) {
+  for (int i=0; i<totalChans; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
 }
 
 void DivPlatformOPL::poke(unsigned int addr, unsigned short val) {
diff --git a/src/engine/platform/opll.cpp b/src/engine/platform/opll.cpp
index f5ab00d9..68cb58b0 100644
--- a/src/engine/platform/opll.cpp
+++ b/src/engine/platform/opll.cpp
@@ -940,6 +940,9 @@ void DivPlatformOPLL::notifyInsChange(int ins) {
 }
 
 void DivPlatformOPLL::notifyInsDeletion(void* ins) {
+  for (int i=0; i<11; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
 }
 
 void DivPlatformOPLL::poke(unsigned int addr, unsigned short val) {
diff --git a/src/engine/platform/qsound.cpp b/src/engine/platform/qsound.cpp
index 0bf6bf2a..cea8c41a 100644
--- a/src/engine/platform/qsound.cpp
+++ b/src/engine/platform/qsound.cpp
@@ -606,7 +606,7 @@ void DivPlatformQSound::forceIns() {
   for (int i=0; i<19; i++) {
     chan[i].insChanged=true;
     chan[i].freqChanged=true;
-    chan[i].sample=-1;
+    //chan[i].sample=-1;
   }
 }
 
@@ -645,7 +645,7 @@ bool DivPlatformQSound::keyOffAffectsArp(int ch) {
 }
 
 void DivPlatformQSound::notifyInsChange(int ins) {
-  for (int i=0; i<4; i++) {
+  for (int i=0; i<19; i++) {
     if (chan[i].ins==ins) {
       chan[i].insChanged=true;
     }
@@ -657,7 +657,7 @@ void DivPlatformQSound::notifyWaveChange(int wave) {
 }
 
 void DivPlatformQSound::notifyInsDeletion(void* ins) {
-  for (int i=0; i<4; i++) {
+  for (int i=0; i<19; i++) {
     chan[i].std.notifyInsDeletion((DivInstrument*)ins);
   }
 }
diff --git a/src/engine/platform/segapcm.cpp b/src/engine/platform/segapcm.cpp
index 25af4211..607e1642 100644
--- a/src/engine/platform/segapcm.cpp
+++ b/src/engine/platform/segapcm.cpp
@@ -406,6 +406,12 @@ void DivPlatformSegaPCM::notifyInsChange(int ins) {
   }
 }
 
+void DivPlatformSegaPCM::notifyInsDeletion(void* ins) {
+  for (int i=0; i<16; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+}
+
 void* DivPlatformSegaPCM::getChanState(int ch) {
   return &chan[ch];
 }
diff --git a/src/engine/platform/segapcm.h b/src/engine/platform/segapcm.h
index 3164e1b9..2f91f03e 100644
--- a/src/engine/platform/segapcm.h
+++ b/src/engine/platform/segapcm.h
@@ -89,6 +89,7 @@ class DivPlatformSegaPCM: public DivDispatch {
     void tick(bool sysTick=true);
     void muteChannel(int ch, bool mute);
     void notifyInsChange(int ins);
+    void notifyInsDeletion(void* ins);
     void renderSamples(int chipID);
     void setFlags(const DivConfig& flags);
     int getOutputCount();
diff --git a/src/engine/platform/tx81z.cpp b/src/engine/platform/tx81z.cpp
index fa3d4d18..12e724c6 100644
--- a/src/engine/platform/tx81z.cpp
+++ b/src/engine/platform/tx81z.cpp
@@ -873,6 +873,12 @@ void DivPlatformTX81Z::notifyInsChange(int ins) {
   }
 }
 
+void DivPlatformTX81Z::notifyInsDeletion(void* ins) {
+  for (int i=0; i<8; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+}
+
 void* DivPlatformTX81Z::getChanState(int ch) {
   return &chan[ch];
 }
diff --git a/src/engine/platform/tx81z.h b/src/engine/platform/tx81z.h
index 4dea61e7..68c9922b 100644
--- a/src/engine/platform/tx81z.h
+++ b/src/engine/platform/tx81z.h
@@ -72,6 +72,7 @@ class DivPlatformTX81Z: public DivPlatformOPM {
     void tick(bool sysTick=true);
     void muteChannel(int ch, bool mute);
     void notifyInsChange(int ins);
+    void notifyInsDeletion(void* ins);
     void setFlags(const DivConfig& flags);
     int getOutputCount();
     void poke(unsigned int addr, unsigned short val);
diff --git a/src/engine/platform/vera.cpp b/src/engine/platform/vera.cpp
index ba9f95fe..443381bb 100644
--- a/src/engine/platform/vera.cpp
+++ b/src/engine/platform/vera.cpp
@@ -411,7 +411,7 @@ int DivPlatformVERA::getOutputCount() {
 }
 
 void DivPlatformVERA::notifyInsDeletion(void* ins) {
-  for (int i=0; i<2; i++) {
+  for (int i=0; i<17; i++) {
     chan[i].std.notifyInsDeletion((DivInstrument*)ins);
   }
 }
diff --git a/src/engine/platform/ym2203.cpp b/src/engine/platform/ym2203.cpp
index 493adfc3..b76a5adb 100644
--- a/src/engine/platform/ym2203.cpp
+++ b/src/engine/platform/ym2203.cpp
@@ -986,6 +986,9 @@ void DivPlatformYM2203::notifyInsChange(int ins) {
 
 void DivPlatformYM2203::notifyInsDeletion(void* ins) {
   ay->notifyInsDeletion(ins);
+  for (int i=0; i<3; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
 }
 
 void DivPlatformYM2203::setSkipRegisterWrites(bool value) {
diff --git a/src/engine/platform/ym2203.h b/src/engine/platform/ym2203.h
index 2f4da5b4..8b8c0d6b 100644
--- a/src/engine/platform/ym2203.h
+++ b/src/engine/platform/ym2203.h
@@ -73,7 +73,7 @@ class DivPlatformYM2203: public DivPlatformOPN {
     int getOutputCount();
     bool keyOffAffectsArp(int ch);
     void notifyInsChange(int ins);
-    void notifyInsDeletion(void* ins);
+    virtual void notifyInsDeletion(void* ins);
     void setSkipRegisterWrites(bool val);
     void poke(unsigned int addr, unsigned short val);
     void poke(std::vector<DivRegWrite>& wlist);
diff --git a/src/engine/platform/ym2203ext.cpp b/src/engine/platform/ym2203ext.cpp
index 701ae9e5..99d53357 100644
--- a/src/engine/platform/ym2203ext.cpp
+++ b/src/engine/platform/ym2203ext.cpp
@@ -641,6 +641,13 @@ void DivPlatformYM2203Ext::notifyInsChange(int ins) {
   }
 }
 
+void DivPlatformYM2203Ext::notifyInsDeletion(void* ins) {
+  DivPlatformYM2203::notifyInsDeletion(ins);
+  for (int i=0; i<4; i++) {
+    opChan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+}
+
 int DivPlatformYM2203Ext::init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) {
   DivPlatformYM2203::init(parent,channels,sugRate,flags);
   for (int i=0; i<4; i++) {
diff --git a/src/engine/platform/ym2203ext.h b/src/engine/platform/ym2203ext.h
index 14535e2d..6d8bb0ba 100644
--- a/src/engine/platform/ym2203ext.h
+++ b/src/engine/platform/ym2203ext.h
@@ -39,6 +39,7 @@ class DivPlatformYM2203Ext: public DivPlatformYM2203 {
     void muteChannel(int ch, bool mute);
     bool keyOffAffectsArp(int ch);
     void notifyInsChange(int ins);
+    void notifyInsDeletion(void* ins);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
     ~DivPlatformYM2203Ext();
diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp
index 15200232..08969eea 100644
--- a/src/engine/platform/ym2608.cpp
+++ b/src/engine/platform/ym2608.cpp
@@ -1458,6 +1458,12 @@ void DivPlatformYM2608::notifyInsChange(int ins) {
 
 void DivPlatformYM2608::notifyInsDeletion(void* ins) {
   ay->notifyInsDeletion(ins);
+  for (int i=0; i<psgChanOffs; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+  for (int i=adpcmAChanOffs; i<chanNum; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
 }
 
 void DivPlatformYM2608::setSkipRegisterWrites(bool value) {
diff --git a/src/engine/platform/ym2608.h b/src/engine/platform/ym2608.h
index 3953e6f6..8d41997f 100644
--- a/src/engine/platform/ym2608.h
+++ b/src/engine/platform/ym2608.h
@@ -88,7 +88,7 @@ class DivPlatformYM2608: public DivPlatformOPN {
     int getOutputCount();
     bool keyOffAffectsArp(int ch);
     void notifyInsChange(int ins);
-    void notifyInsDeletion(void* ins);
+    virtual void notifyInsDeletion(void* ins);
     void setSkipRegisterWrites(bool val);
     void poke(unsigned int addr, unsigned short val);
     void poke(std::vector<DivRegWrite>& wlist);
diff --git a/src/engine/platform/ym2608ext.cpp b/src/engine/platform/ym2608ext.cpp
index 0a6abe7a..e8e35cdc 100644
--- a/src/engine/platform/ym2608ext.cpp
+++ b/src/engine/platform/ym2608ext.cpp
@@ -679,6 +679,13 @@ void DivPlatformYM2608Ext::notifyInsChange(int ins) {
   }
 }
 
+void DivPlatformYM2608Ext::notifyInsDeletion(void* ins) {
+  DivPlatformYM2608::notifyInsDeletion(ins);
+  for (int i=0; i<4; i++) {
+    opChan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+}
+
 int DivPlatformYM2608Ext::init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) {
   DivPlatformYM2608::init(parent,channels,sugRate,flags);
   for (int i=0; i<4; i++) {
diff --git a/src/engine/platform/ym2608ext.h b/src/engine/platform/ym2608ext.h
index 01afb361..e99518fb 100644
--- a/src/engine/platform/ym2608ext.h
+++ b/src/engine/platform/ym2608ext.h
@@ -39,6 +39,7 @@ class DivPlatformYM2608Ext: public DivPlatformYM2608 {
     void muteChannel(int ch, bool mute);
     bool keyOffAffectsArp(int ch);
     void notifyInsChange(int ins);
+    void notifyInsDeletion(void* ins);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
     ~DivPlatformYM2608Ext();
diff --git a/src/engine/platform/ym2610.cpp b/src/engine/platform/ym2610.cpp
index 48fa4ca0..5c62a491 100644
--- a/src/engine/platform/ym2610.cpp
+++ b/src/engine/platform/ym2610.cpp
@@ -1406,6 +1406,12 @@ void DivPlatformYM2610::notifyInsChange(int ins) {
 
 void DivPlatformYM2610::notifyInsDeletion(void* ins) {
   ay->notifyInsDeletion(ins);
+  for (int i=0; i<psgChanOffs; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+  for (int i=adpcmAChanOffs; i<chanNum; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
 }
 
 void DivPlatformYM2610::setSkipRegisterWrites(bool value) {
diff --git a/src/engine/platform/ym2610.h b/src/engine/platform/ym2610.h
index a3bf53b4..bdf92dd5 100644
--- a/src/engine/platform/ym2610.h
+++ b/src/engine/platform/ym2610.h
@@ -56,7 +56,7 @@ class DivPlatformYM2610: public DivPlatformYM2610Base {
     int getOutputCount();
     bool keyOffAffectsArp(int ch);
     void notifyInsChange(int ins);
-    void notifyInsDeletion(void* ins);
+    virtual void notifyInsDeletion(void* ins);
     void setSkipRegisterWrites(bool val);
     void poke(unsigned int addr, unsigned short val);
     void poke(std::vector<DivRegWrite>& wlist);
diff --git a/src/engine/platform/ym2610b.cpp b/src/engine/platform/ym2610b.cpp
index 875383e7..a8f2329e 100644
--- a/src/engine/platform/ym2610b.cpp
+++ b/src/engine/platform/ym2610b.cpp
@@ -1477,6 +1477,12 @@ void DivPlatformYM2610B::notifyInsChange(int ins) {
 
 void DivPlatformYM2610B::notifyInsDeletion(void* ins) {
   ay->notifyInsDeletion(ins);
+  for (int i=0; i<psgChanOffs; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+  for (int i=adpcmAChanOffs; i<chanNum; i++) {
+    chan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
 }
 
 void DivPlatformYM2610B::setSkipRegisterWrites(bool value) {
diff --git a/src/engine/platform/ym2610b.h b/src/engine/platform/ym2610b.h
index ca2cb333..7f0bad81 100644
--- a/src/engine/platform/ym2610b.h
+++ b/src/engine/platform/ym2610b.h
@@ -52,7 +52,7 @@ class DivPlatformYM2610B: public DivPlatformYM2610Base {
     int getOutputCount();
     bool keyOffAffectsArp(int ch);
     void notifyInsChange(int ins);
-    void notifyInsDeletion(void* ins);
+    virtual void notifyInsDeletion(void* ins);
     void setSkipRegisterWrites(bool val);
     void poke(unsigned int addr, unsigned short val);
     void poke(std::vector<DivRegWrite>& wlist);
diff --git a/src/engine/platform/ym2610bext.cpp b/src/engine/platform/ym2610bext.cpp
index c8d0b645..28563b20 100644
--- a/src/engine/platform/ym2610bext.cpp
+++ b/src/engine/platform/ym2610bext.cpp
@@ -670,6 +670,13 @@ void DivPlatformYM2610BExt::notifyInsChange(int ins) {
   }
 }
 
+void DivPlatformYM2610BExt::notifyInsDeletion(void* ins) {
+  DivPlatformYM2610B::notifyInsDeletion(ins);
+  for (int i=0; i<4; i++) {
+    opChan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+}
+
 int DivPlatformYM2610BExt::init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) {
   DivPlatformYM2610B::init(parent,channels,sugRate,flags);
   for (int i=0; i<4; i++) {
diff --git a/src/engine/platform/ym2610bext.h b/src/engine/platform/ym2610bext.h
index c7764959..50bd5bad 100644
--- a/src/engine/platform/ym2610bext.h
+++ b/src/engine/platform/ym2610bext.h
@@ -39,6 +39,7 @@ class DivPlatformYM2610BExt: public DivPlatformYM2610B {
     void muteChannel(int ch, bool mute);
     bool keyOffAffectsArp(int ch);
     void notifyInsChange(int ins);
+    void notifyInsDeletion(void* ins);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
     ~DivPlatformYM2610BExt();
diff --git a/src/engine/platform/ym2610ext.cpp b/src/engine/platform/ym2610ext.cpp
index 54bbd2b7..03442dc5 100644
--- a/src/engine/platform/ym2610ext.cpp
+++ b/src/engine/platform/ym2610ext.cpp
@@ -670,6 +670,13 @@ void DivPlatformYM2610Ext::notifyInsChange(int ins) {
   }
 }
 
+void DivPlatformYM2610Ext::notifyInsDeletion(void* ins) {
+  DivPlatformYM2610::notifyInsDeletion(ins);
+  for (int i=0; i<4; i++) {
+    opChan[i].std.notifyInsDeletion((DivInstrument*)ins);
+  }
+}
+
 int DivPlatformYM2610Ext::init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) {
   DivPlatformYM2610::init(parent,channels,sugRate,flags);
   for (int i=0; i<4; i++) {
diff --git a/src/engine/platform/ym2610ext.h b/src/engine/platform/ym2610ext.h
index 5e78c53f..e4103338 100644
--- a/src/engine/platform/ym2610ext.h
+++ b/src/engine/platform/ym2610ext.h
@@ -39,6 +39,7 @@ class DivPlatformYM2610Ext: public DivPlatformYM2610 {
     void muteChannel(int ch, bool mute);
     bool keyOffAffectsArp(int ch);
     void notifyInsChange(int ins);
+    void notifyInsDeletion(void* ins);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
     ~DivPlatformYM2610Ext();