Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-27 16:35:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'v0.6-TorControl' of github.com:csoler/RetroShare into v0.6-TorControl

Browse source
This commit is contained in:
csoler 2021-12-30 19:51:53 +01:00
commit 1e8e489cd1
9 changed files with 49 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/TorControl/TorControlWindow.cpp
View file

@ -42,6 +42,11 @@ TorControlDialog::TorControlDialog(QWidget *)
adjustSize();
}
TorControlDialog::~TorControlDialog()
{
rsEvents->unregisterEventsHandler(mEventHandlerId);
}
void TorControlDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
{
if(event->mType != RsEventType::TOR_MANAGER) return;

1
retroshare-gui/src/TorControl/TorControlWindow.h
View file

@ -15,6 +15,7 @@ class TorControlDialog: public QWidget, public Ui::TorControlDialog
public:
TorControlDialog(QWidget *parent =NULL);
virtual ~TorControlDialog();
enum TorStatus {
TOR_STATUS_UNKNOWN = 0x00,

4
retroshare-gui/src/main.cpp
View file

@ -591,6 +591,10 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
RsGxsUpdateBroadcast::cleanup();
#endif
if (is_auto_tor) {
RsTor::stop();
}
RsControl::instance()->rsGlobalShutDown();
delete(soundManager);