From 3d2321887d3beb8c3d15531e8e77296d3d5c23cd Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 11 Jun 2008 22:05:49 +0000
Subject: [PATCH] reenable sound in Cancel(), rather than as a special case in
 the input, so it works if someone else calls Cancel

---
 stepmania/src/ScreenDemonstration.cpp | 6 ++++++
 stepmania/src/ScreenDemonstration.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index 56aa38fb4e..098e3f918c 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -87,6 +87,12 @@ void ScreenDemonstration::HandleScreenMessage( const ScreenMessage SM )
 	ScreenJukebox::HandleScreenMessage( SM );
 }
 
+void ScreenDemonstration::Cancel( ScreenMessage smSendWhenDone )
+{
+	ScreenAttract::SetAttractVolume( false ); // unmute attract sounds
+	ScreenJukebox::Cancel( smSendWhenDone );
+}
+
 /*
  * (c) 2003-2004 Chris Danford
  * All rights reserved.
diff --git a/stepmania/src/ScreenDemonstration.h b/stepmania/src/ScreenDemonstration.h
index d4cde8b86e..619d36563b 100644
--- a/stepmania/src/ScreenDemonstration.h
+++ b/stepmania/src/ScreenDemonstration.h
@@ -11,6 +11,7 @@ class ScreenDemonstration : public ScreenJukebox
 public:
 	ScreenDemonstration();
 	virtual void Init();
+	virtual void Cancel( ScreenMessage smSendWhenDone );
 
 	virtual void HandleScreenMessage( const ScreenMessage SM );