From 0a6875df3bb6c35cac2ea42fcbb729e2e0e68c5f Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sat, 14 Jan 2012 15:34:42 +0000 Subject: [PATCH] Fix Crash on no ErgFile selected Fixes #600. --- src/TrainTool.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/TrainTool.cpp b/src/TrainTool.cpp index 05828df1e..a22d2e7a5 100644 --- a/src/TrainTool.cpp +++ b/src/TrainTool.cpp @@ -994,10 +994,13 @@ void TrainTool::guiUpdate() // refreshes the telemetry rtData.setMsecs(total_msecs); rtData.setLapMsecs(lap_msecs); - long lapTimeRemaining = ergFile->nextLap(load_msecs) - load_msecs; + long lapTimeRemaining; + if (ergFile) lapTimeRemaining = ergFile->nextLap(load_msecs) - load_msecs; + else lapTimeRemaining = 0; + if(lapTimeRemaining < 0) { - lapTimeRemaining = ergFile->Duration - load_msecs; + if (ergFile) lapTimeRemaining = ergFile->Duration - load_msecs; if(lapTimeRemaining < 0) lapTimeRemaining = 0; }