Changeset 12540 for trunk/FACT++/src/ConnectionUSB.cc

Timestamp:

11/16/11 21:55:19 (13 years ago)

Author:

tbretz

Message:

Fixed a bug which could cause crahses when a transmission is interrupted at the moment the connection is opened and e.g. the bias crate is not yet switched on.

File:

• trunk/FACT++/src/ConnectionUSB.cc (modified) (2 diffs)

trunk/FACT++/src/ConnectionUSB.cc

@@ -205 +205 @@
     // functions directly from any other place then Handlers, use
     // PostMessage instead
-    fOutQueue.pop_front();
+    if (!fOutQueue.empty())
+        fOutQueue.pop_front();
 
     if (fOutQueue.empty())
@@ -214 +215 @@
     }
 
-    // AsyncWrite + Deadline
+     // AsyncWrite + Deadline
     AsyncWrite(ba::const_buffers_1(fOutQueue.front().data(), fOutQueue.front().size())/*, &ConnectionUSB::HandleSentData*/);
     AsyncWait(fOutTimeout, 5000, &ConnectionUSB::HandleWriteTimeout);