Fix: return before initialization of diagnostic manager.
authorRomain Forlot <romain.forlot@iot.bzh>
Mon, 13 Mar 2017 22:11:41 +0000 (23:11 +0100)
committerRomain Forlot <romain.forlot@iot.bzh>
Thu, 16 Mar 2017 16:15:55 +0000 (17:15 +0100)
Change-Id: I8485dec1ec5bb5dbea7edf4d9ac3a7d800b567b2
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
src/low-can-binding.cpp

index 8ecf742..7a19c62 100644 (file)
@@ -247,15 +247,13 @@ extern "C"
 
                /// Initialize CAN socket
                if(can_bus_manager.init_can_dev() == 0)
-               {
                        can_bus_manager.start_threads();
-                       return 0;
-               }
 
                /// Initialize Diagnostic manager that will handle obd2 requests.
                /// We pass by default the first CAN bus device to its Initialization.
                /// TODO: be able to choose the CAN bus device that will be use as Diagnostic bus.
-               configuration_t::instance().get_diagnostic_manager().initialize(can_bus_manager.get_can_devices().front());
+               if(configuration_t::instance().get_diagnostic_manager().initialize(can_bus_manager.get_can_devices().front()))
+                       return 0;
 
                ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
                return 1;