mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed segfault when enabling DAQ CH2

This commit is contained in:
Chris Esposito 2019-07-13 20:48:06 +10:00
parent a19b5ce3fd
commit 44626f0f34
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Desktop_Interface/mainwindow.cpp
View File

@ -2027,7 +2027,7 @@ void MainWindow::on_actionRecord_CH2_triggered(bool checked)
return; //User cancelled return; //User cancelled
} }
#endif #endif
output375_CH2 = new QFile(outputDir->filePath("375_CH2.csv")); output375_CH2 = new QFile(fileName);
ui->controller_iso->internalBuffer375_CH2->enableFileIO(output375_CH2, daq_num_to_average, daq_max_file_size); ui->controller_iso->internalBuffer375_CH2->enableFileIO(output375_CH2, daq_num_to_average, daq_max_file_size);
return; return;
} }

1
Desktop_Interface/mainwindow.h
View File

@ -221,7 +221,6 @@ private:
QWheelEvent *wheelEmu; QWheelEvent *wheelEmu;
bool forceSquare = false; bool forceSquare = false;
QCPItemText *textLabel; QCPItemText *textLabel;
QDir *outputDir;
QFile *output375_CH1, *output375_CH2, *output750; QFile *output375_CH1, *output375_CH2, *output750;
unsigned char caibrateStage; unsigned char caibrateStage;
QMessageBox *calibrationMessages; QMessageBox *calibrationMessages;