Restore Interface status to Ready if Camera::prepareAcq fails

src/EigerInterface.cpp

@@ -110,6 +110,7 @@ void Interface::prepareAcq()
     m_stream->release_all_msgs();
     m_stream->resetStatistics();
 
+    try {
       m_cam.prepareAcq();
       int serie_id; m_cam.getSerieId(serie_id);
       m_saving->setSerieId(serie_id);
@@ -117,6 +118,11 @@ void Interface::prepareAcq()
 	double stream_armed_timeout = 5.0;
 	m_stream->waitArmed(stream_armed_timeout);
       }
+    } catch (...) {
+      m_saving->stop();
+      m_stream->stop();
+      throw;
+    }
 }
 
 //-----------------------------------------------------

src/EigerStream.cpp

@@ -255,8 +255,12 @@ void Stream::stop()
 {
   DEB_MEMBER_FUNCT();
   AutoMutex aLock(m_cond.mutex());
-  if (!_isRunning())
+  bool connected = (m_state == Connected);
+  if (!_isRunning() || connected) {
+    if (connected)
+      _abort();
     return;
+  }
   DEB_TRACE() << "Stopped";
   m_state = Stopped;
   _send_synchro();