Ignore USB errors for bulkReadMulti after first packet

oliverhaag
1 parent 840e89be
Showing 3 changed files with 9 additions and 6 deletions
openhantek/ChangeLog
openhantek/src/hantek/control.cpp
openhantek/src/hantek/device.cpp
@@ -161,3 +161,6 @@
  
 2012-10-03 Oliver Haag  <oliver.haag@gmail.com>
 * Bugfix: Add CAPTURE_READY2250 for the DSO-2250
+
+2012-10-07 Oliver Haag  <oliver.haag@gmail.com>
+* Ignore errors after first packet was received by Hantek::Device::bulkReadMulti
@@ -193,8 +193,10 @@ namespace Hantek {
 			int lastCaptureState = captureState;
 #endif
 			captureState = this->getCaptureState();
+			if(captureState < 0)
+				qWarning("Getting capture state failed: %s", Helper::libUsbErrorString(captureState).toLocal8Bit().data());
 #ifdef DEBUG
-			if(captureState != lastCaptureState)
+			else if(captureState != lastCaptureState)
 				qDebug("Capture state changed to %d", captureState);
 #endif
 			switch(captureState) {
@@ -271,8 +273,6 @@ namespace Hantek {
 				case CAPTURE_SAMPLING:
 					break;
 				default:
-					if(captureState < 0)
-						qWarning("Getting capture state failed: %s", Helper::libUsbErrorString(captureState).toLocal8Bit().data());
 					break;
 			}
 		}
@@ -397,10 +397,10 @@ namespace Hantek {
 				received += errorCode;
 		}
  
-		if(errorCode < 0)
-			return errorCode;
-		else
+		if(received > 0)
 			return received;
+		else
+			return errorCode;
 	}
  
 	/// \brief Control transfer to the oscilloscope.