Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-29 11:19:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4648 from ctrlaltdavid/dde-shutdown

Browse source 
Terminate DDE process gracefully
This commit is contained in:
Clément Brisset 2015-04-17 16:28:32 +02:00
commit e780d8e482
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/devices/DdeFaceTracker.cpp
View file

@ -182,9 +182,10 @@ void DdeFaceTracker::setEnabled(bool enabled) {
_udpSocket.bind(_host, _serverPort); _udpSocket.bind(_host, _serverPort);
} }
const char* DDE_EXIT_COMMAND = "exit";
if (enabled && !_ddeProcess) { if (enabled && !_ddeProcess) {
// Terminate any existing DDE process, perhaps left running after an Interface crash // Terminate any existing DDE process, perhaps left running after an Interface crash
const char* DDE_EXIT_COMMAND = "exit";
_udpSocket.writeDatagram(DDE_EXIT_COMMAND, DDE_SERVER_ADDR, _controlPort); _udpSocket.writeDatagram(DDE_EXIT_COMMAND, DDE_SERVER_ADDR, _controlPort);
qDebug() << "[Info] DDE Face Tracker Starting"; qDebug() << "[Info] DDE Face Tracker Starting";
@ -194,7 +195,8 @@ void DdeFaceTracker::setEnabled(bool enabled) {
} }
if (!enabled && _ddeProcess) { if (!enabled && _ddeProcess) {
_ddeProcess->kill(); // More robust than trying to send an "exit" command to DDE _udpSocket.writeDatagram(DDE_EXIT_COMMAND, DDE_SERVER_ADDR, _controlPort);
delete _ddeProcess;
_ddeProcess = NULL; _ddeProcess = NULL;
qDebug() << "[Info] DDE Face Tracker Stopped"; qDebug() << "[Info] DDE Face Tracker Stopped";
} }