As suggested by Guy: Have mark_frame() do nothing if the frame has

already been marked and have unmark_frame() do likewise.  Don't mess
with the marked frame count in mark_all_frames().

Be a little more paranoid about the marked frame count in other places.

svn path=/trunk/; revision=11775

1 files changed, 10 insertions, 6 deletions

diff --git a/file.c b/file.c
index b0e6890610..60e2e33485 100644
--- a/file.c
+++ b/file.c
@@ -2776,9 +2776,11 @@ unselect_field(capture_file *cf)
 void
 mark_frame(capture_file *cf, frame_data *frame)
 {
-  frame->flags.marked = TRUE;
-  if (cf->count > cf->marked_count)
-    cf->marked_count++;
+  if (! frame->flags.marked) {
+    frame->flags.marked = TRUE;
+    if (cf->count > cf->marked_count)
+      cf->marked_count++;
+  }
 }
 
 /*
@@ -2787,9 +2789,11 @@ mark_frame(capture_file *cf, frame_data *frame)
 void
 unmark_frame(capture_file *cf, frame_data *frame)
 {
-  frame->flags.marked = FALSE;
-  if (cf->marked_count > 0)
-    cf->marked_count--;
+  if (frame->flags.marked) {
+    frame->flags.marked = FALSE;
+    if (cf->marked_count > 0)
+      cf->marked_count--;
+  }
 }
 
 typedef struct {