b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2026-07-14 22:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug

Browse Source 
Trying to fix #22
Open client with QProcess::Text for proper newline character(s)
On Raspbian, the isBusy() function will always return false, even the serial port is actually connected.
This commit is contained in:
wh201906
2021-09-05 21:35:03 +08:00
parent 02a8fe03e3
commit 12a0837c50
5 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/mainwindow.cpp
+4 -4
View File
@@ -126,11 +126,11 @@ void MainWindow::on_PM3_connectButton_clicked()
// use the shell session to keep the environment then read it
#ifdef Q_OS_WIN
// cmd /c "<path>">>nul && set
envSetProcess.start("cmd");
envSetProcess.write(QString("\"" + envScriptPath.absoluteFilePath() + "\">>nul\r\n").toLatin1());
envSetProcess.start("cmd", {}, QProcess::Unbuffered | QProcess::ReadWrite | QProcess::Text);
envSetProcess.write(QString("\"" + envScriptPath.absoluteFilePath() + "\">>nul\n").toLatin1());
envSetProcess.waitForReadyRead(10000);
envSetProcess.readAll();
envSetProcess.write("set\r\n");
envSetProcess.write("set\n");
#else
// need implementation(or test if space works)
// sh -c '. "<path>">>/dev/null && env'
@@ -138,7 +138,7 @@ void MainWindow::on_PM3_connectButton_clicked()
#endif
envSetProcess.waitForReadyRead(10000);
QString envSetResult = QString(envSetProcess.readAll());
clientEnv = envSetResult.split(QRegExp("[\r\n]{1,2}"), QString::SkipEmptyParts);
clientEnv = envSetResult.split("\n", QString::SkipEmptyParts);
if(clientEnv.size() > 2) // the first element is "set" and the last element is the current path
{
clientEnv.removeFirst();