dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD: https://github.com/Proxmark/proxmark3/pull/417 (@merlokk)

Browse Source 
CHG:  https://github.com/Proxmark/proxmark3/pull/434 (@pwpiwi)
This commit is contained in:
iceman1001
2017-10-20 20:39:57 +02:00
parent 4b48e63ccc
commit b27a9920b1
10 changed files with 279 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/proxguiqt.cpp
View File

@@ -77,7 +77,19 @@ void ProxGuiQT::_Exit(void) {
delete this;
}
void ProxGuiQT::MainLoop() {
void ProxGuiQT::_StartProxmarkThread(void) {
if (!proxmarkThread)
return;
// if thread finished delete self and delete application
QObject::connect(proxmarkThread, SIGNAL(finished()), proxmarkThread, SLOT(deleteLater()));
QObject::connect(proxmarkThread, SIGNAL(finished()), this, SLOT(_Exit()));
// start proxmark thread
proxmarkThread->start();
}
void ProxGuiQT::MainLoop()
{
plotapp = new QApplication(argc, argv);
connect(this, SIGNAL(ShowGraphWindowSignal()), this, SLOT(_ShowGraphWindow()));
@@ -85,10 +97,16 @@ void ProxGuiQT::MainLoop() {
connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
connect(this, SIGNAL(ExitSignal()), this, SLOT(_Exit()));
//start proxmark thread after starting event loop
QTimer::singleShot(200, this, SLOT(_StartProxmarkThread()));
plotapp->exec();
}
ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL), argc(argc), argv(argv) {}
ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NULL), plotwidget(NULL),
argc(argc), argv(argv), proxmarkThread(wthread)
{
}
ProxGuiQT::~ProxGuiQT(void) {
if (plotapp) {