From 11cee807b75cbd079e01dca40b653982d2850d40 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Mon, 2 Mar 2015 15:52:32 +0100
Subject: [PATCH] Timeline: Check end time for sanity before setting range

Change-Id: I69a3ea81b1c4e1df51663d8e5c75972f67635a26
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/libs/timeline/qml/TimelineContent.qml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/libs/timeline/qml/TimelineContent.qml b/src/libs/timeline/qml/TimelineContent.qml
index 998c5c108ba..c4d1a273537 100644
--- a/src/libs/timeline/qml/TimelineContent.qml
+++ b/src/libs/timeline/qml/TimelineContent.qml
@@ -172,12 +172,11 @@ ScrollView {
                         if (modelData.endTime(selectedItem) < zoomer.rangeStart ||
                                 modelData.startTime(selectedItem) > zoomer.rangeEnd) {
 
-                            var newStart = (modelData.startTime(selectedItem) +
-                                            modelData.endTime(selectedItem) -
-                                            zoomer.rangeDuration) / 2;
-                            zoomer.setRange(Math.max(newStart, zoomer.traceStart),
-                                            Math.min(newStart + zoomer.rangeDuration,
-                                                     zoomer.traceEnd));
+                            var newStart = Math.max((modelData.startTime(selectedItem) +
+                                                     modelData.endTime(selectedItem) -
+                                                     zoomer.rangeDuration) / 2, zoomer.traceStart);
+                            zoomer.setRange(newStart,
+                                            Math.min(newStart + zoomer.rangeDuration, zoomer.traceEnd));
                         }
 
                         var row = modelData.row(selectedItem);