From fab70c5365051a06ea8454c02054aa61f0a2062e Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Wed, 30 Nov 2016 17:38:23 +0100
Subject: [PATCH] Fixed problem when no trigger channel is selected

---
 software/drsosc/DOFrame.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/software/drsosc/DOFrame.cpp b/software/drsosc/DOFrame.cpp
index 4039ce8..62c9ab0 100644
--- a/software/drsosc/DOFrame.cpp
+++ b/software/drsosc/DOFrame.cpp
@@ -1744,17 +1744,14 @@ void DOFrame::OnSetTriggerConfig(int id, bool flag)
       }
    }
    
-   if ((m_trgConfig[m_board] & 0x7FFF) > 0) {
-      m_rbSource->SetSelection(GetTriggerChannel(m_board));
-      if (m_multiBoard) {
-         for (int i=0 ; i<m_osci->GetNumberOfBoards() ; i++) {
-            m_osci->GetBoard(i)->SetTriggerConfig(m_trgConfig[i]);
-         }
-      } else {
-         m_osci->SetTriggerConfig(m_trgConfig[m_board]);
+   m_rbSource->SetSelection(GetTriggerChannel(m_board));
+   if (m_multiBoard) {
+      for (int i=0 ; i<m_osci->GetNumberOfBoards() ; i++) {
+         m_osci->GetBoard(i)->SetTriggerConfig(m_trgConfig[i]);
       }
+   } else {
+      m_osci->SetTriggerConfig(m_trgConfig[m_board]);
    }
-
 }
 
 /*------------------------------------------------------------------*/