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

Source/Main.cpp

@@ -76,7 +76,15 @@ public:
     {
 #ifdef WIN32
 		glWinInit();
+#ifdef DEBUG
+		if (AllocConsole())
+		{
+			freopen("CONOUT$","w",stdout);
+			SetConsoleTitle("Debug Console");
+		}
 #endif
+#endif
+
         mainWindow = new MainWindow();
        
 

Source/Processors/Editors/SpikeDetectorEditor.cpp

@@ -242,12 +242,15 @@ void SpikeDetectorEditor::buttonEvent(Button* button)
 
         refreshElectrodeList();
 
-        electrodeList->setSelectedId(electrodeList->getNumItems(), true);
-        electrodeList->setText(electrodeList->getItemText(electrodeList->getNumItems()-1));
-        lastId = electrodeList->getNumItems();
-        electrodeList->setEditableText(true);
-
-        drawElectrodeButtons(electrodeList->getNumItems()-1);
+		if (electrodeList->getNumItems() > 0) 
+		{
+			electrodeList->setSelectedId(electrodeList->getNumItems(), true);
+			electrodeList->setText(electrodeList->getItemText(electrodeList->getNumItems()-1));
+			lastId = electrodeList->getNumItems();
+			electrodeList->setEditableText(true);
+
+			drawElectrodeButtons(electrodeList->getNumItems()-1);
+		}
 
         getEditorViewport()->makeEditorVisible(this, true, true);
         return;