From 03cc15e489c052d6faf743c1037b8575ecc59b05 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sat, 26 Mar 2016 10:33:22 +0000 Subject: [PATCH] Fix JS warning with null div .. in RideSummaryWindow we update to show progress of the model estimates, but it errors if the html is not set or is blank and does not contain the div 'modhead'. --- src/Charts/RideSummaryWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Charts/RideSummaryWindow.cpp b/src/Charts/RideSummaryWindow.cpp index b28848095..ce1996b5a 100644 --- a/src/Charts/RideSummaryWindow.cpp +++ b/src/Charts/RideSummaryWindow.cpp @@ -220,10 +220,10 @@ RideSummaryWindow::modelProgress(int year, int month) #ifdef NOWEBKIT rideSummary->page()->runJavaScript( - QString("var div = document.getElementById(\"modhead\"); div.innerHTML = '%1'; ").arg(string));; + QString("var div = document.getElementById(\"modhead\"); if (div != null) div.innerHTML = '%1'; ").arg(string));; #else rideSummary->page()->mainFrame()->evaluateJavaScript( - QString("var div = document.getElementById(\"modhead\"); div.innerHTML = '%1'; ").arg(string));; + QString("var div = document.getElementById(\"modhead\"); if (div != null) div.innerHTML = '%1'; ").arg(string));; #endif }