Ticket #1755: dsmccpatch.txt

File dsmccpatch.txt, 1.1 KB (added by dm@…, 18 years ago)
Line 
1Index: libs/libmythtv/dsmcccache.cpp
2===================================================================
3--- libs/libmythtv/dsmcccache.cpp       (revision 9838)
4+++ libs/libmythtv/dsmcccache.cpp       (working copy)
5@@ -208,7 +208,7 @@
6     pDir->m_Files.insert(name, *entry);
7 
8     VERBOSE(VB_DSMCC,
9-            QString("[DSMCCCache] Adding file with name %1s reference %2")
10+            QString("[DSMCCCache] Adding file with name %1 reference %2")
11             .arg(name.ascii()).arg(entry->toString()));
12 }
13 
14@@ -287,7 +287,7 @@
15             QMap<QString, DSMCCCacheReference>::Iterator ref =
16                 dir->m_Files.find(name);
17 
18-            if (ref == NULL)
19+            if (ref == dir->m_Files.end())
20                 return -1; // Not there.
21 
22             DSMCCCacheFile *fil = FindFileData(*ref);
23@@ -303,7 +303,7 @@
24             QMap<QString, DSMCCCacheReference>::Iterator ref =
25                 dir->m_SubDirectories.find(name);
26 
27-            if (ref == NULL)
28+            if (ref == dir->m_SubDirectories.end())
29                 return -1; // Not there
30 
31             dir = FindDir(*ref);