b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2025-04-20 19:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in disconnect()

Browse Source
This commit is contained in:
wh201906 2021-02-22 12:47:55 +08:00
parent fb8e1a6e1b
commit c3aafc3d31
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/pm3process.cpp
View File

@ -108,9 +108,7 @@ void PM3Process::onTimeout() //when the proxmark3 client is unexpectedly termina
// qDebug()<<portInfo->isBusy(); // qDebug()<<portInfo->isBusy();
if(!portInfo->isBusy()) if(!portInfo->isBusy())
{ {
kill(); killPM3();
emit PM3StatedChanged(false);
setSerialListener(false);
} }
} }
@ -149,3 +147,10 @@ void PM3Process::setWorkingDir(const QString& dir)
// the working directory cannot be the default, or the client will failed to load the dll // the working directory cannot be the default, or the client will failed to load the dll
this->setWorkingDirectory(dir); this->setWorkingDirectory(dir);
} }
void PM3Process::killPM3()
{
kill();
emit PM3StatedChanged(false);
setSerialListener(false);
}

1
common/pm3process.h
View File

@ -30,6 +30,7 @@ public slots:
void reconnectPM3(); void reconnectPM3();
void setProcEnv(const QStringList* env); void setProcEnv(const QStringList* env);
void setWorkingDir(const QString& dir); void setWorkingDir(const QString& dir);
void killPM3();
private slots: private slots:
void onTimeout(); void onTimeout();
void onReadyRead(); void onReadyRead();

2
ui/mainwindow.cpp
View File

@ -1039,7 +1039,7 @@ void MainWindow::signalInit()
connect(this, &MainWindow::reconnectPM3, pm3, &PM3Process::reconnectPM3); connect(this, &MainWindow::reconnectPM3, pm3, &PM3Process::reconnectPM3);
connect(pm3, &PM3Process::PM3StatedChanged, this, &MainWindow::onPM3StateChanged); connect(pm3, &PM3Process::PM3StatedChanged, this, &MainWindow::onPM3StateChanged);
connect(pm3, &PM3Process::PM3StatedChanged, util, &Util::setRunningState); connect(pm3, &PM3Process::PM3StatedChanged, util, &Util::setRunningState);
connect(this, &MainWindow::killPM3, pm3, &PM3Process::kill); connect(this, &MainWindow::killPM3, pm3, &PM3Process::killPM3);
connect(this, &MainWindow::setProcEnv, pm3, &PM3Process::setProcEnv); connect(this, &MainWindow::setProcEnv, pm3, &PM3Process::setProcEnv);
connect(this, &MainWindow::setWorkingDir, pm3, &PM3Process::setWorkingDir); connect(this, &MainWindow::setWorkingDir, pm3, &PM3Process::setWorkingDir);
connect(this, QOverload<bool>::of(&MainWindow::setSerialListener), pm3, QOverload<bool>::of(&PM3Process::setSerialListener)); connect(this, QOverload<bool>::of(&MainWindow::setSerialListener), pm3, QOverload<bool>::of(&PM3Process::setSerialListener));