From 4549f5b733800562551bae9e950155422522c68f Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Wed, 20 Mar 2019 14:42:38 -0400
Subject: [PATCH] fixing cut off non-returning INIT (was accidentally running
 the second init for 1 second before beginning audible playback)

---
 distribute/nsfplay.txt      | 4 ++--
 xgm/devices/CPU/nes_cpu.cpp | 3 +++
 xgm/version.h               | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/distribute/nsfplay.txt b/distribute/nsfplay.txt
index 30e03ae..bfd99f0 100644
--- a/distribute/nsfplay.txt
+++ b/distribute/nsfplay.txt
@@ -159,7 +159,7 @@ loopcount - number of times to loop, 0 default
 Versions
 ========
 
-NSFPlay 2.4 beta 17 - 3/19/2019
+NSFPlay 2.4 beta 18 - 3/20/2019
 - Fixed incorrect bytes per second in stereo WAV output.
 - Fixed NSFe track title display when using playlist.
 - Fixed crash issue with 1MB NSF files. (Bank counting was incorrect.)
@@ -191,7 +191,7 @@ NSFPlay 2.4 beta 17 - 3/19/2019
 - N163 compatbility options for phase write protect and limited wavelength. (Supports old NSFs that are not hardware accurate.)
 - Option to randomize starting triangle phase.
 - NSFe VRC7 chunk implemented, provisional support for YM2413 variant.
-- VRC7 patch set dump via Nuke.YKT
+- VRC7 patch set dump by Nuke.YKT.
 
 NSFPlay 2.3 - 7/19/2013
 Emulation:
diff --git a/xgm/devices/CPU/nes_cpu.cpp b/xgm/devices/CPU/nes_cpu.cpp
index 1443a3f..66b9b78 100644
--- a/xgm/devices/CPU/nes_cpu.cpp
+++ b/xgm/devices/CPU/nes_cpu.cpp
@@ -326,7 +326,9 @@ void NES_CPU::Start (
 	run_from (init_addr);
 
 	// temporarily disable PLAY for INIT
+	bool extra_init_temp = extra_init;
 	int play_addr_temp = play_addr;
+	extra_init = false;
 	play_addr = -1;
 
 	// run up to 1 second of init before starting real playback (this allows INIT to modify $4011 etc. silently)
@@ -346,6 +348,7 @@ void NES_CPU::Start (
 			if (nmi_play) enable_nmi = true;
 		}
 	}
+	extra_init = extra_init_temp; // restore extra_init
 	play_addr = play_addr_temp; // restore PLAY
 
 	// start of first frame
diff --git a/xgm/version.h b/xgm/version.h
index 22b8b56..fb30b52 100644
--- a/xgm/version.h
+++ b/xgm/version.h
@@ -1,5 +1,5 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
-#define NSFPLAY_TITLE "NSFPlay 2.4 beta 17"
-#define NSFPLAY_VERSION "2.4 beta 17"
+#define NSFPLAY_TITLE "NSFPlay 2.4 beta 18"
+#define NSFPLAY_VERSION "2.4 beta 18"
 #endif