WebSVN – spk – Diff – //libspk/src/CatFile.cpp

+	}
 	else if ( err != FILEERR_NONE )
 		return false;
 	// adjust the file positions
-	bool bAdjust = false;
-	int iOffset;
+	int iOffset = -1;
 	for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() ) {
-		int iNextOffset = node->Data()->lOffset;
-		if ( bAdjust ) {
+		if ( node->Data() == f ) {
-			node->Data()->lOffset = iOffset;
+			iOffset = node->Data()->lOffset;
+		}
-		else if ( node->Data() == f ) {
+		else if ( iOffset >= 0 ) {
-			bAdjust = true;
+			node->Data()->lOffset = iOffset;
+			iOffset += node->Data()->lSize;
+		}
-		else if ( !bAdjust ) continue;
-		iOffset = iNextOffset;
+	}
 	// now just write the new cat file
 	m_lFiles.remove ( f );
 	WriteCatFile ();

Subversion Repositories spk