nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Master (remote control) channel fixes

Browse Source 
Moved the signal to stop the timer from AttemptTransition() to
Close(), as was not reliably reached.

Also disconnect the timer event slot on close, to avoid multiple
calls on subsequent sessions.
This commit is contained in:
Jon Escombe
2016-01-06 12:41:57 +00:00
parent 7693a9fc09
commit 133674f329
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ANT.cpp
View File

@@ -842,6 +842,10 @@ ANT::slotStopBroadcastTimer(int channel) // timer
//qDebug()<<"ANT::slotStopTimer req from channel "<<channel;
// disconnect the slot, else we duplicate signals on subsequent sessions
disconnect(antChannel[channel]->channelTimer, SIGNAL(timeout()), this, SLOT(slotControlTimerEvent()));
// stop the broadcast timer..
antChannel[channel]->channelTimer->stop();
}

9
src/ANTChannel.cpp
View File

@@ -121,6 +121,11 @@ void ANTChannel::close()
emit lostInfo(number);
lastMessage = ANTMessage();
if (is_master) {
//qDebug()<<number<<"Stopping timer..";
emit broadcastTimerStop(number);
}
// lets shutdown
qDebug()<<"** CLOSING CHANNEL"<<number<<"**";
status = Closing;
@@ -1059,10 +1064,6 @@ void ANTChannel::attemptTransition(int message_id)
//qDebug()<<number<<"TRANSITION from closed";
status = Closed;
//qDebug()<<"** CHANNEL"<<number<<"NOW CLOSED **";
if (is_master) {
//qDebug()<<number<<"Stopping timer..";
emit broadcastTimerStop(number);
}
break;
default: