Changeset 6381


Ignore:
Timestamp:
05/25/10 10:29:19 (10 years ago)
Author:
melissa
Message:

Fixed bug in file renaming logic.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/bio-formats/src/loci/formats/in/MetamorphReader.java

    r6378 r6381  
    539539        } 
    540540        if (handler.getBinning() != null) binning = handler.getBinning(); 
    541         store.setDetectorSettingsBinning(getBinning(binning), i, c); 
     541        if (binning != null) { 
     542          store.setDetectorSettingsBinning(getBinning(binning), i, c); 
     543        } 
    542544        if (handler.getReadOutRate() != 0) { 
    543545          store.setDetectorSettingsReadOutRate(handler.getReadOutRate(), i, c); 
     
    924926        return l.exists() ? l.getAbsolutePath() : null; 
    925927      } 
     928      else return l.getAbsolutePath(); 
    926929    } 
    927930    return null; 
  • trunk/components/bio-formats/src/loci/formats/in/MetamorphReader.java

    r6378 r6381  
    539539        } 
    540540        if (handler.getBinning() != null) binning = handler.getBinning(); 
    541         store.setDetectorSettingsBinning(getBinning(binning), i, c); 
     541        if (binning != null) { 
     542          store.setDetectorSettingsBinning(getBinning(binning), i, c); 
     543        } 
    542544        if (handler.getReadOutRate() != 0) { 
    543545          store.setDetectorSettingsReadOutRate(handler.getReadOutRate(), i, c); 
     
    924926        return l.exists() ? l.getAbsolutePath() : null; 
    925927      } 
     928      else return l.getAbsolutePath(); 
    926929    } 
    927930    return null; 
Note: See TracChangeset for help on using the changeset viewer.