From 1f1cf2f841de7e9d92a44bc80f93b7f2d9b9c6fa Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 27 May 2007 19:05:00 +0000
Subject: [PATCH] fix merge

---
 stepmania/src/OptionRow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 3961957058..7c32bc8899 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -666,7 +666,7 @@ void OptionRow::SetOptionIcon( PlayerNumber pn, const RString &sText, GameComman
 {
 	// update bullet
 	Message msg( "Refresh" );
-	msg.SetParam( "GameCommand", gc );
+	msg.SetParam( "GameCommand", &gc );
 	m_sprBullet->HandleMessage( msg );
 	if( m_OptionIcons[pn] != NULL )
 		m_OptionIcons[pn]->Set( pn, sText, false );