From 08c1db9345fa7d07d552d6b2f2d4a92109a93547 Mon Sep 17 00:00:00 2001 From: allen Date: Sat, 29 Jun 2013 02:43:18 +0000 Subject: [PATCH] Fixed a bug where nonstops were appearing in Doubles Play. --- deploy/DMX.exe | Bin 170496 -> 170496 bytes src/source/songwheelMode.cpp | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/DMX.exe b/deploy/DMX.exe index 1f47ebe535fd6718b11f39a898262cb9026ee4df..7e1bd5060f5bf0e3e1c802a5d3d4154fb34fe569 100644 GIT binary patch delta 5203 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 diff --git a/src/source/songwheelMode.cpp b/src/source/songwheelMode.cpp index 8ebdcc1..9c5194a 100644 --- a/src/source/songwheelMode.cpp +++ b/src/source/songwheelMode.cpp @@ -193,12 +193,12 @@ bool isSongAvailable(int index) } } - if ( (gs.isDoubles && songs[index].mildDouble == 0 && songs[index].wildDouble == 0) || (!gs.isDoubles && songs[index].mildSingle == 0 && songs[index].mildSingle == 0) ) + if ( (gs.isDoubles && songs[index].mildDouble == 0 && songs[index].wildDouble == 0) || (!gs.isDoubles && songs[index].mildSingle == 0 && songs[index].wildSingle == 0) ) { return false; } - return songs[index].version != 0 && (earnedIt || allsongsDebug); + return songs[index].version != 0 && songs[index].version < 100 && (earnedIt || allsongsDebug); } void killPreviewClip()