Skip to content

Commit 7704ed6

Browse files
committed
Added version number check
1 parent 0e957d3 commit 7704ed6

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

mainwindow.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <QMessageBox>
2424
#include <QDesktopServices>
2525
#include <QDateTime>
26+
#include <QRegularExpression>
2627
#include "settings.h"
2728

2829
const QString MainWindow::names[] = { "File", "Common", "Mill", "Drill", "Outline", "Autoleveller" };
@@ -439,13 +440,16 @@ void MainWindow::menu_aboutpcb2gcode()
439440
QString MainWindow::getPcb2gcodeVersion()
440441
{
441442
QProcess pcb2gcodeVersionProcess(this);
442-
QByteArray version;
443+
QRegularExpressionMatch res;
443444

444445
pcb2gcodeVersionProcess.start(PCB2GCODE_EXECUTABLE, QStringList("--version"), QProcess::ReadOnly);
445446
pcb2gcodeVersionProcess.waitForReadyRead(2000);
446-
version = pcb2gcodeVersionProcess.readAllStandardOutput();
447+
res = QRegularExpression("\\d+\\.\\d+\\.\\d+").match( pcb2gcodeVersionProcess.readAllStandardOutput() );
447448

448-
return QString(version);
449+
if(res.hasMatch())
450+
return res.captured();
451+
else
452+
return "UNABLE TO RETRIEVE VERSION";
449453
}
450454

451455
void MainWindow::menu_aboutpcb2gcodeGUI()

0 commit comments

Comments
 (0)