Browse Source

restored backg. thread; removed deinit()

pull/526/head
hypnosis-i2p 9 years ago
parent
commit
4b8466e5e5
  1. 24
      qt/i2pd_qt/DaemonQT.cpp
  2. 1
      qt/i2pd_qt/DaemonQT.h

24
qt/i2pd_qt/DaemonQT.cpp

@ -78,11 +78,6 @@ namespace qt @@ -78,11 +78,6 @@ namespace qt
setRunningCallback(0);
m_IsRunning=false;
return Daemon.init(argc,argv);
}
void DaemonQTImpl::deinit()
{
delete mutex; mutex = nullptr;
}
void DaemonQTImpl::start()
@ -129,9 +124,10 @@ namespace qt @@ -129,9 +124,10 @@ namespace qt
int RunQT (int argc, char* argv[])
{
//int result = runGUI(argc, argv);
//QMessageBox::information(0,"Debug","runGUI completed");
QApplication app(argc, argv);
int result;
{
DaemonQTImpl daemon;
qDebug("Initialising the daemon...");
bool daemonInitSuccess = daemon.init(argc, argv);
@ -144,19 +140,19 @@ namespace qt @@ -144,19 +140,19 @@ namespace qt
MainWindow w;
qDebug("Before main window.show()...");
w.show ();
int result;
{
/* i2p::qt::Controller daemonQtController(daemon);
i2p::qt::Controller daemonQtController(daemon);
qDebug("Starting the daemon...");
emit daemonQtController.startDaemon();
qDebug("Starting gui event loop...");*/
daemon.start ();
//daemon.start ();
qDebug("Starting GUI event loop...");
result = app.exec();
daemon.stop ();
//daemon.stop ();
}
daemon.deinit();
}
//QMessageBox::information(&w, "Debug", "demon stopped");
//exit(result); //return from main() causes intermittent sigsegv bugs in some Androids. exit() is a workaround for this
qDebug("Exiting the application");
return result;
}

1
qt/i2pd_qt/DaemonQT.h

@ -25,7 +25,6 @@ namespace qt @@ -25,7 +25,6 @@ namespace qt
* @return success
*/
bool init(int argc, char* argv[]);
void deinit();
void start();
void stop();
void restart();

Loading…
Cancel
Save