Improve behaviour for incorrect track ids

Author: mastervanleeuwen

components/com_jtg/models/track.php

@@ -408,11 +408,6 @@ function getFile ($id)
 		$result = $db->loadObject();
 		$this->track = $result; // Cache track for use with edit/delete etc
 
-		if (! $result)
-		{
-			return JTable::getInstance('jtg_files', 'table');
-		}
-
 		return $result;
 	}
 

components/com_jtg/views/track/view.html.php

@@ -200,6 +200,11 @@ public function display($tpl = null)
 				$document->addScript(JUri::root(true) . '/components/com_jtg/assets/js/animatedCursor.js');
 			}
 			$this->track = $model->getFile( $this->id );
+			if (!$this->track) {
+				$mainframe->enqueueMessage("Track not found id ".$this->id,'Error');
+				$mainframe->redirect(Uri::root());
+				return false;
+			}
 			$file = JPATH_SITE . '/images/jtrackgallery/uploaded_tracks/' . strtolower($this->track->file);
 			$gpsData = new GpsDataClass($file, $this->track->file);
 			$this->imageList = $model->getImages($this->id);
@@ -236,6 +241,7 @@ public function display($tpl = null)
 			}
 			else {
 				$gpsData = new GpsDataClass;
+				$this->tags = null;
 			}
 		}
 		if (! isset($this->track) )