From 3610303408208b607579f4c7176e68a12e2e91a8 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 15 Oct 2005 00:35:54 +0000 Subject: [PATCH] ignore empty directories so we don't have to let CVS prune before we can test changes that delete a dir --- stepmania/src/ThemeManager.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index c87708f7b6..1e93bc37a3 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -360,8 +360,18 @@ try_element_again: for( int i = 0; asset_masks[i]; ++i ) { /* No extension means directories. */ - if( asset_masks[i][0] == 0 && !IsADirectory(asPaths[p]) ) - continue; + if( asset_masks[i][0] == 0 ) + { + if( !IsADirectory(asPaths[p]) ) + continue; + + vector vs; + GetDirListing( asPaths[p]+"/*", vs, false, false ); + StripCvs( vs ); + bool bDirIsEmpty = vs.empty(); + if( bDirIsEmpty ) + continue; + } if( ext == asset_masks[i] || !strcmp(asset_masks[i], "*") ) {