File tree 3 files changed +9
-4
lines changed
3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,11 @@ int PortController::enableDevice()
40
40
return 0 ;
41
41
}
42
42
43
+ void PortController::startAcquisition ()
44
+ {
45
+ errorFlag = false ;
46
+ }
47
+
43
48
void PortController::stopAcquisition ()
44
49
{
45
50
while (!frameArray.isEmpty ())
Original file line number Diff line number Diff line change @@ -90,7 +90,7 @@ class PortController : public OnixDevice
90
90
91
91
int updateSettings () override { return 0 ; }
92
92
93
- void startAcquisition () override {} ;
93
+ void startAcquisition () override ;
94
94
95
95
void stopAcquisition () override ;
96
96
Original file line number Diff line number Diff line change @@ -454,8 +454,8 @@ bool OnixSource::isReady()
454
454
if (!devicesFound)
455
455
return false ;
456
456
457
- if (editor->isHeadstageSelected (PortName::PortA) && !portA->checkLinkState () && portA-> getErrorFlag () ) return false ;
458
- if (editor->isHeadstageSelected (PortName::PortB) && !portB->checkLinkState () && portB-> getErrorFlag () ) return false ;
457
+ if (editor->isHeadstageSelected (PortName::PortA) && !portA->checkLinkState ()) return false ;
458
+ if (editor->isHeadstageSelected (PortName::PortB) && !portB->checkLinkState ()) return false ;
459
459
460
460
for (auto source : sources)
461
461
{
@@ -562,5 +562,5 @@ bool OnixSource::updateBuffer()
562
562
portA->processFrames ();
563
563
portB->processFrames ();
564
564
565
- return ! portA->getErrorFlag () && ! portB->getErrorFlag ();
565
+ return portA->getErrorFlag () || portB->getErrorFlag ();
566
566
}
You can’t perform that action at this time.
0 commit comments