Merge branch 'master' into thread_test

688fda8d · Lorenz Meier · 6e9ac2fc · 559931f3 · 688fda8d
Commit 688fda8d authored May 06, 2014 by Lorenz Meier
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

WaypointList.cc src/ui/WaypointList.cc +9 -7

No files found.
--- a/src/ui/WaypointList.cc
+++ b/src/ui/WaypointList.cc
@@ -390,13 +390,15 @@ void WaypointList::currentWaypointEditableChanged(quint16 seq)
            {
                WaypointEditableView* widget = wpEditableViews.find(waypoints[i]).value();

-                if (waypoints[i]->getId() == seq)
-                {
-                    widget->setCurrent(true);
-                }
-                else
-                {
-                    widget->setCurrent(false);
+                if (widget) {
+                    if (waypoints[i]->getId() == seq)
+                    {
+                        widget->setCurrent(true);
+                    }
+                    else
+                    {
+                        widget->setCurrent(false);
+                    }
                }
            }
        }