Mercurial > hg > xmms-sid

diff src/xs_fileinfo.c @ 473:f1a997715ef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 25 Jan 2007 07:21:05 +0000
parents 1d55247ad0cc
children 1775b3f16cd9
line wrap: on
line diff
--- a/src/xs_fileinfo.c	Thu Jan 25 05:58:05 2007 +0000
+++ b/src/xs_fileinfo.c	Thu Jan 25 07:21:05 2007 +0000
@@ -123,7 +123,7 @@
 		} else
 			tmpFilename = pcFilename;
 
-		XSDEBUG("xs_stil_get('%s') = '%s'\n", pcFilename, tmpFilename);
+XSDEBUG("xs_stil_get('%s') = '%s'\n", pcFilename, tmpFilename);
 		
 		pResult = xs_stildb_get_node(xs_stildb_db, tmpFilename);
 	} else
@@ -321,17 +321,18 @@
 	/* Other menu items */
 	for (n = 1; n <= tmpInfo->nsubTunes; n++) {
 		gchar tmpStr[64];
-		if (xs_fileinfostil && n <= xs_fileinfostil->nsubTunes) {
+		if (xs_fileinfostil && n <= xs_fileinfostil->nsubTunes && xs_fileinfostil->subTunes[n]) {
 			t_xs_stil_subnode *tmpNode = xs_fileinfostil->subTunes[n];
 			
 			g_snprintf(tmpStr, sizeof(tmpStr), _("Tune #%i: "), n);
 
-			if (tmpNode) {
-				if (tmpNode->pName)
-					xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pName);
-				else if (tmpNode->pInfo)
-					xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pInfo);
-			} else
+			if (tmpNode->pName)
+				xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pName);
+			else if (tmpNode->pTitle)
+				xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pTitle);
+			else if (tmpNode->pInfo)
+				xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->pInfo);
+			else
 				xs_pnstrcat(tmpStr, sizeof(tmpStr), "---");
 		} else {
 			g_snprintf(tmpStr, sizeof(tmpStr), _("Tune #%i"), n);