From d84435a6f1969eb94b14c459298f91408719ab9a Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 16 Nov 2016 18:16:05 +0100 Subject: [PATCH] Patch for unassociated issues --- .../client/lib/MeasurementHandlers.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Packages/ohif-measurements/client/lib/MeasurementHandlers.js b/Packages/ohif-measurements/client/lib/MeasurementHandlers.js index 34b920a5d..145f1a914 100644 --- a/Packages/ohif-measurements/client/lib/MeasurementHandlers.js +++ b/Packages/ohif-measurements/client/lib/MeasurementHandlers.js @@ -84,7 +84,11 @@ class MeasurementHandlers { // Update the Overall Measurement Numbers for all Measurements if (timepointApi) { const baseline = timepointApi.baseline(); - measurementApi.sortMeasurements(baseline.timepointId); + + // TODO: Fix this it is a terrible workaround but we have a demo to do + if (baseline) { + measurementApi.sortMeasurements(baseline.timepointId); + } } } @@ -146,7 +150,11 @@ class MeasurementHandlers { const timepointApi = instance.data.timepointApi; if (timepointApi) { const baseline = timepointApi.baseline(); - measurementApi.sortMeasurements(baseline.timepointId); + + // TODO: Fix this it is a terrible workaround but we have a demo to do + if (baseline) { + measurementApi.sortMeasurements(baseline.timepointId); + } } } }