From kde-commits  Fri Aug 19 19:48:36 2011
From: Christian Esken <esken () kde ! org>
Date: Fri, 19 Aug 2011 19:48:36 +0000
To: kde-commits
Subject: KDE/kdemultimedia/kmix
Message-Id: <20110819194836.26286AC876 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=131378333408799

SVN commit 1248126 by esken:

CCBUGS: 206051
Be extra defensive: Don't accidently start timer when polling not required.

 M  +2 -0      backends/mixer_backend.cpp  
 M  +1 -1      core/mixer.h  


--- trunk/KDE/kdemultimedia/kmix/backends/mixer_backend.cpp #1248125:1248126
@@ -140,12 +140,14 @@
 	{
 		// We explicitely exclude Mixer::OK_UNCHANGED and Mixer::ERROR_READ
 		if ( needsPolling() )
+		{
 			_pollingTimer->setInterval(50);
 		QTime fastPollingEndsAt = QTime::currentTime ();
 		fastPollingEndsAt = fastPollingEndsAt.addSecs(5);
 		_fastPollingEndsAt = fastPollingEndsAt;
 		//_fastPollingEndsAt = fastPollingEndsAt;
 		kDebug() << "Start fast polling from " << QTime::currentTime() <<"until " << _fastPollingEndsAt;
+		}
 		emit controlChanged();
 	}
 
--- trunk/KDE/kdemultimedia/kmix/core/mixer.h #1248125:1248126
@@ -56,7 +56,7 @@
 	 * 
 	 */
     enum MixerError { OK=0, ERR_PERM=1, ERR_WRITE, ERR_READ,
-        ERR_OPEN, ERR_LASTERR, OK_UNCHANGED };
+        ERR_OPEN, OK_UNCHANGED };
 
 
     Mixer( QString& ref_driverName, int device );