github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-06 05:01:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing the crash on exit

Browse source
This commit is contained in:
pwpiwi 2017-06-01 15:35:19 +02:00
parent a5eb7820a5
commit 5acd195d0f
7 changed files with 75 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

38
client/proxgui.cpp
View file

@ -10,8 +10,22 @@
#include "proxgui.h"
#include "proxguiqt.h"
#include "proxmark3.h"
static ProxGuiQT *gui = NULL;
static WorkerThread *main_loop_thread = NULL;
WorkerThread::WorkerThread(char *script_cmds_file, bool usb_present) : script_cmds_file(script_cmds_file), usb_present(usb_present)
{
}
WorkerThread::~WorkerThread()
{
}
void WorkerThread::run() {
main_loop(script_cmds_file, usb_present);
}
extern "C" void ShowGraphWindow(void)
{
@ -39,31 +53,35 @@ extern "C" void RepaintGraphWindow(void)
extern "C" void MainGraphics(void)
{
if (!gui)
return;
if (!gui)
return;
gui->MainLoop();
main_loop_thread->start();
gui->MainLoop();
}
extern "C" void InitGraphics(int argc, char **argv)
extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, bool usb_present)
{
#ifdef Q_WS_X11
bool useGUI = getenv("DISPLAY") != 0;
bool useGUI = getenv("DISPLAY") != 0;
#else
bool useGUI = true;
bool useGUI = true;
#endif
if (!useGUI)
return;
if (!useGUI)
return;
gui = new ProxGuiQT(argc, argv);
gui = new ProxGuiQT(argc, argv);
main_loop_thread = new WorkerThread(script_cmds_file, usb_present);
QObject::connect(main_loop_thread, SIGNAL(finished()), main_loop_thread, SLOT(deleteLater()));
QObject::connect(main_loop_thread, SIGNAL(finished()), gui, SLOT(_Exit()));
}
extern "C" void ExitGraphics(void)
{
if (!gui)
return;
gui->Exit();
//delete gui;
gui = NULL;
}