Commit 45e5ae38 authored by lm's avatar lm

Merge branch 'dev-lin' of github.com:pixhawk/qgroundcontrol into v10release

parents ce33abda 989a897e
......@@ -92,6 +92,7 @@ public slots:
statusMessage = "";
if (actionPending) statusMessage = "TIMED OUT, NO ACTION";
statusClearTimer.start();
userSetPointSet = false;
actionPending = false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment