Skip to content

Commit

Permalink
Merge pull request #511 from moritz-h/fix-tablejoin
Browse files Browse the repository at this point in the history
Fix Tablejoin
  • Loading branch information
straubar committed Jan 23, 2020
2 parents cfe9b5e + ba85b51 commit f80f93b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions plugins/mmstd_datatools/src/table/TableJoin.cpp
Expand Up @@ -66,6 +66,10 @@ bool TableJoin::processData(core::Call &c) {
TableDataCall *secondInCall = this->secondTableInSlot.CallAs<TableDataCall>();
if (secondInCall == NULL) return false;

// call getHash before check of frame count
if (!(*firstInCall)(1)) return false;
if (!(*secondInCall)(1)) return false;

// check time compatibility
if (firstInCall->GetFrameCount() != secondInCall->GetFrameCount()) {
vislib::sys::Log::DefaultLog.WriteError(_T("%hs: Cannot join tables. ")
Expand Down

0 comments on commit f80f93b

Please sign in to comment.