Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
sytelus committed Feb 13, 2018
1 parent b249a1c commit c894780
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion DroneServer/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ int main(int argc, const char* argv[])
MavLinkDroneController::ConnectionInfo connection_info;

// read settings and override defaults
Settings& settings = Settings::singleton().loadJSonFile("settings.json");
auto settings_full_filepath = Settings::getUserDirectoryFullPath("settings.json");
Settings& settings = Settings::singleton().loadJSonFile(settings_full_filepath);
Settings child;
if (settings.isLoadSuccess()) {
settings.getChild("PX4", child);
Expand Down

0 comments on commit c894780

Please sign in to comment.