From 4dfeb3eb89ddf0a9d8b81781d0cefe4796ab99bf Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Sat, 19 Jul 2014 10:11:14 -0600
Subject: [PATCH] Changed NoteSkinManager::LoadActor to always return a Sprite
 on failure because some elements must be a sprite.

---
 src/NoteSkinManager.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/NoteSkinManager.cpp b/src/NoteSkinManager.cpp
index 198c9812db..1c226daa55 100644
--- a/src/NoteSkinManager.cpp
+++ b/src/NoteSkinManager.cpp
@@ -438,18 +438,14 @@ Actor *NoteSkinManager::LoadActor( const RString &sButton, const RString &sEleme
 	if( !PushActorTemplate(L, sButton, sElement, bSpriteOnly) )
 	{
 		// ActorUtil will warn about the error
-		return new Actor;
+		return new Sprite;
 	}
 
 	auto_ptr<XNode> pNode( XmlFileUtil::XNodeFromTable(L) );
 	if( pNode.get() == NULL )
 	{
 		// XNode will warn about the error
-		if(bSpriteOnly)
-		{
-			return new Sprite;
-		}
-		return new Actor;
+		return new Sprite;
 	}
 
 	LUA->Release( L );