From 14a4d8f8b06abb095cf6c9db718b4e26c266e78b Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Wed, 2 Jun 2010 17:04:55 +0000 Subject: Fix a regression from r49377 - we should be checking against code in addition to index for duplicate MLST's. svn-id: r49395 --- engines/mohawk/video.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines') diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index ed1fc6b2c6..a45a4294c8 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -246,11 +246,11 @@ void VideoManager::activateMLST(uint16 mlstId, uint16 card) { // We've found a match, add it if (mlstRecord.index == mlstId) { - // Make sure we don't have a duplicate + // Make sure we don't have any duplicates for (uint32 j = 0; j < _mlstRecords.size(); j++) - if (_mlstRecords[j].index == mlstId) { + if (_mlstRecords[j].index == mlstRecord.index || _mlstRecords[j].code == mlstRecord.code) { _mlstRecords.remove_at(j); - break; + j--; } _mlstRecords.push_back(mlstRecord); -- cgit v1.2.3