From 6a4e9434c0306394d3509463e83343eb47236a01 Mon Sep 17 00:00:00 2001
From: CMBDTC <cmbdtc@openrce.org>
Date: Fri, 1 Jan 2010 12:05:29 +0000
Subject: [PATCH] CMBDTC 2.1

---
 Topaz_Tools/lib/CMBDTC.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Topaz_Tools/lib/CMBDTC.py b/Topaz_Tools/lib/CMBDTC.py
index 2ace131..bf5777a 100644
--- a/Topaz_Tools/lib/CMBDTC.py
+++ b/Topaz_Tools/lib/CMBDTC.py
@@ -2,7 +2,7 @@
 
 """
 
-Comprehensive Mazama Book DRM with Topaz Cryptography V2.0
+Comprehensive Mazama Book DRM with Topaz Cryptography V2.1
 
 -----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdBHJ4CNc6DNFCw4MRCw4SWAK6
@@ -400,8 +400,11 @@ def getBookPayloadRecord(name, index):
     
     if recordIndex != index :
       raise CMBDTCFatal("Parse Error : Invalid Record, index doesn't match")
-            
-    record = bookFile.read(bookHeaderRecords[name][index][1])
+
+    if bookHeaderRecords[name][index][2] != 0 :
+        record = bookFile.read(bookHeaderRecords[name][index][2])
+    else:
+        record = bookFile.read(bookHeaderRecords[name][index][1])
     
     if encrypted:
        ctx = topazCryptoInit(bookKey)