From ab78cf294614bf9b9bf0756d9364492ef27d00b8 Mon Sep 17 00:00:00 2001
From: lukked <47635487+lukked@users.noreply.github.com>
Date: Tue, 2 Apr 2019 20:33:34 +0200
Subject: [PATCH] Fix exception handling in reporter.py

---
 flightgoggles_reporter/src/reporter.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/flightgoggles_reporter/src/reporter.py b/flightgoggles_reporter/src/reporter.py
index 70f822c..1a01c52 100755
--- a/flightgoggles_reporter/src/reporter.py
+++ b/flightgoggles_reporter/src/reporter.py
@@ -93,17 +93,11 @@ def __init__(self):
 
 		# Read the events from the challenge params
 		name=rospy.get_param('/uav/challenge_name', '')
-		if (name == ''):
-			rospy.logerr("Challenge name could not be read")
-			rospy.signal_shutdown("Challenge parameter [name] could not be read")
 
 		rospy.loginfo("Running challenge %s", name)
 
 		# Set a timeout to check if challenge is taking longer than allowed
 		timeout = rospy.get_param('/uav/timeout', -1)
-		if (timeout == -1):
-			rospy.logerr("Timeout not specified!")
-			rospy.signal_shutdown("Challenge parameter [timeout] could not be read")
 
 		rospy.Subscriber("/uav/collision", Empty, self.collisionCallback)
 
@@ -154,6 +148,13 @@ def __init__(self):
 					rospy.loginfo("Completed the challenge")
 					rospy.signal_shutdown("Challenge complete")
 
+			if (name == ''):
+				rospy.logerr("Challenge name could not be read")
+				rospy.signal_shutdown("Challenge parameter [name] could not be read")
+			if (timeout == -1):
+				rospy.logerr("Timeout not specified!")
+				rospy.signal_shutdown("Challenge parameter [timeout] could not be read")
+
 			rospy.sleep(1./rate)
 
 	def imuCallback(self,data):