From 668be17204e45efecc4728e200b50b394a8f4a4b Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 10 Apr 2004 22:15:16 +0000
Subject: [PATCH] fix dupe texture loads (mostly harmless _blank/_black dupes,
 but sometimes more)

---
 stepmania/src/RageTextureID.cpp | 6 ++++++
 stepmania/src/RageTextureID.h   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/stepmania/src/RageTextureID.cpp b/stepmania/src/RageTextureID.cpp
index 489e86f856..aa0d1a93da 100644
--- a/stepmania/src/RageTextureID.cpp
+++ b/stepmania/src/RageTextureID.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "RageTextureID.h"
 #include "RageTextureManager.h"
+#include "RageUtil.h"
 
 void RageTextureID::Init()
 {
@@ -51,3 +52,8 @@ bool RageTextureID::operator==(const RageTextureID &rhs) const
 		// EQUAL(Policy); // don't do this
 }
 
+void RageTextureID::SetFilename( const CString &fn )
+{
+	filename = fn;
+	CollapsePath( filename );
+}
diff --git a/stepmania/src/RageTextureID.h b/stepmania/src/RageTextureID.h
index 8c1988ac84..21a80ea8de 100644
--- a/stepmania/src/RageTextureID.h
+++ b/stepmania/src/RageTextureID.h
@@ -58,7 +58,8 @@ struct RageTextureID
 	void Init();
 
 	RageTextureID() { Init(); }
-	RageTextureID(const CString &fn) { Init(); filename=fn; }
+	RageTextureID( const CString &fn ) { Init(); SetFilename(fn); }
+	void SetFilename( const CString &fn );
 };
 
 #endif