From a7fc41580d44352e79341e3ad2e662a3b2a7491c Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 17 Jan 2006 22:15:53 +0000
Subject: [PATCH] partial revert: m_pHand may be NULL before loaded

---
 stepmania/src/OptionRow.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 011cd93fec..92c76ce4b5 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -103,8 +103,11 @@ void OptionRow::Clear()
 	FOREACH_PlayerNumber( p )
 		m_Underline[p].clear();
 
-	FOREACH_CONST( CString, m_pHand->m_vsReloadRowMessages, m )
-		MESSAGEMAN->Unsubscribe( this, *m );
+	if( m_pHand != NULL )
+	{
+		FOREACH_CONST( CString, m_pHand->m_vsReloadRowMessages, m )
+			MESSAGEMAN->Unsubscribe( this, *m );
+	}
 	SAFE_DELETE( m_pHand );
 
 	m_bFirstItemGoesDown = false;