(Location/Camera) Let the user know when the camera/location functionality

has been explicitly disabled in the frontend
This commit is contained in:
twinaphex 2014-05-26 19:18:52 +02:00
parent 619c96187b
commit 40f7e80745
2 changed files with 16 additions and 4 deletions

View File

@ -76,8 +76,14 @@ void find_next_camera_driver(void)
bool driver_camera_start(void)
{
if (driver.camera && driver.camera_data && g_settings.camera.allow)
return driver.camera->start(driver.camera_data);
if (driver.camera && driver.camera_data)
{
if (g_settings.camera.allow)
return driver.camera->start(driver.camera_data);
msg_queue_push(g_extern.msg_queue, "Camera is explicitly disabled.\n", 1, 180);
return false;
}
else
return false;
}

View File

@ -70,8 +70,14 @@ void find_next_location_driver(void)
bool driver_location_start(void)
{
if (driver.location && driver.location_data && g_settings.location.allow)
return driver.location->start(driver.location_data);
if (driver.location && driver.location_data)
{
if (g_settings.location.allow)
return driver.location->start(driver.location_data);
msg_queue_push(g_extern.msg_queue, "Location is explicitly disabled.\n", 1, 180);
return false;
}
else
return false;
}