Merge branch 'master' of github.com:open-ephys/GUI

Source/Processors/FileReader/FileReader.cpp

@@ -127,6 +127,8 @@ bool FileReader::setFile(String fullpath)
     }
     static_cast<FileReaderEditor*>(getEditor())->populateRecordings(input);
     setActiveRecording(0);
+    
+    return true;
 }
 
 void FileReader::setActiveRecording(int index)

Source/Processors/FileReader/FileReaderEditor.cpp

@@ -156,9 +156,11 @@ void FileReaderEditor::comboBoxChanged(ComboBox* combo)
 
 void FileReaderEditor::populateRecordings(FileSource* source)
 {
+    
     recordSelector->clear(dontSendNotification);
     for (int i=0; i < source->getNumRecords(); i++)
     {
+        //sendActionMessage("Got file " + source->getRecordName(i));
         recordSelector->addItem(source->getRecordName(i),i+1);
     }
     recordSelector->setSelectedId(1,dontSendNotification);