Show
Ignore:
Timestamp:
02/25/10 17:31:35 (2 years ago)
Author:
gbooker
Message:

Merged changes from the branch back to trunk

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/SapphireFrappliance/MetaDataImporting/SapphireNfoImporter.m

    r1044 r1179  
    4848        /*Check for NFO file*/ 
    4949        BOOL nfoPathIsDir = NO; 
    50         NSString *nfoFilePath=[[path stringByDeletingPathExtension] stringByAppendingPathExtension:@"nfo"]; 
     50        NSString *extLessPath = path; 
     51        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS) 
     52                extLessPath = [extLessPath stringByDeletingPathExtension]; 
     53         
     54        NSString *nfoFilePath=[extLessPath stringByAppendingPathExtension:@"nfo"]; 
    5155        if(![fm fileExistsAtPath:nfoFilePath isDirectory:&nfoPathIsDir] || nfoPathIsDir) 
    5256                return ImportStateNotUpdated;