From 7280c1ccb37804f0f0f805c5688a0b9233c95b49 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Mon, 24 Oct 2005 13:39:10 +0000
Subject: [PATCH] Simplify.

---
 .../src/arch/InputHandler/InputHandler_Carbon.cpp  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/arch/InputHandler/InputHandler_Carbon.cpp b/stepmania/src/arch/InputHandler/InputHandler_Carbon.cpp
index 9a433ba115..49355c3a7f 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Carbon.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_Carbon.cpp
@@ -149,18 +149,10 @@ bool Device::Open( io_object_t device )
 		int vid, pid;
 		
 		if( vidRef && !IntValue(vidRef, &vid) )
-			vidRef = NULL;
+			vid = 0;
 		if( pidRef && !IntValue(pidRef, &pid) )
-			pidRef = NULL;
-		
-		if( vidRef && pidRef )
-			mDescription = ssprintf( "%04x:%04x", vid, pid );
-		else if( vidRef )
-			mDescription = ssprintf( "%04x", vid );
-		else if( pidRef )
-			mDescription = ssprintf( "%04x", pid );
-		else
-			mDescription = "(unknown)";
+			pid = 0;
+		mDescription = ssprintf( "%04x:%04x", vid, pid );
 	}
 	
 	CFArrayRef logicalDevices;