Ede_Vau
/
qtdmm
mirror of https://github.com/jhol/qtdmm.git
1
0
Fork 0
Code Issues Releases Wiki Activity

DMM: Keep m_timerId so that it can be passed to killTimer

This commit is contained in:
Joel Holdsworth 2014-04-18 20:38:35 +01:00
parent abe9255330
commit 73be7fd27c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dmm.cpp
View File

@ -284,7 +284,7 @@ DMM::open()
timerEvent( 0 );
startTimer( 1000 );
m_timerId = startTimer( 1000 );
return true;
}
@ -293,7 +293,7 @@ void
DMM::close()
{
QTime t; t.start();
killTimers();
killTimer(m_timerId);
m_error = tr( "Not connected" );
emit error( m_error );

1
src/dmm.h
View File

@ -78,6 +78,7 @@ protected:
bool m_consoleLogging;
bool m_externalSetup;
int m_flags;
int m_timerId;
void timerEvent( QTimerEvent * );
void customEvent( QCustomEvent * );