Changeset 2288

Timestamp:

03/08/10 11:48:55 (5 months ago)

Author:

gm78

Message:

Closes #128. The code in the Points overlay that added a point to the list of selected points did not consider a NULL point, which is a valid case.

Files:

• FalconView/trunk/public/Applications/FalconView/localpnt/localpnt.cpp (modified) (3 diffs)

FalconView/trunk/public/Applications/FalconView/localpnt/localpnt.cpp

@@ -3740 +3740 @@
 void C_localpnt_ovl::add_current_selection(C_localpnt_point* point)
 {
-   ASSERT(point);
-
-   if (!m_selected_points.Find(point))  //if the point is not already in focus
+   if (point != NULL && !m_selected_points.Find(point))  //if the point is not already in focus
    {
       m_selected_points.AddTail(point);
@@ -3750 +3748 @@
     // Note: the following line is local point specific
     if (m_selected_points.GetCount() == 1)
-        m_EditDialogControl.SetFocus(point->m_id, point->m_group_name, get_specification());
+   {
+      C_localpnt_point* pnt = m_selected_points.GetHead();
+        m_EditDialogControl.SetFocus(pnt->m_id, pnt->m_group_name, get_specification());
+   }
     else
         m_EditDialogControl.SetFocus(NULL);
@@ -3758 +3759 @@
     if (m_selected_points.GetCount() == 1)
       {
-           set_link_edit_dlg_focus(point);
+           set_link_edit_dlg_focus(m_selected_points.GetHead());
       }
       else