bugfix: when no packets were captured, don't call cf_cb_live_capture_finished after...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14039 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/capture.c b/capture.c
index 4e704273fafc4fb2512d3c0b8c240b7a4921c75e..ca0a413280dafc097bae7a485c7327b6da2cb675 100644 (file)
--- a/capture.c
+++ b/capture.c
@@ -281,28 +281,30 @@ capture_input_closed(capture_options *capture_opts)
               simple_dialog_primary_start(), simple_dialog_primary_end(),
               cf_is_tempfile(capture_opts->cf) ? "temporary " : "");
               cf_close(capture_opts->cf);
+              /* we have closed the capture file, don't call cf_cb_live_capture_finished! */
             }
             break;
         case CF_READ_ERROR:
           /* Just because we got an error, that doesn't mean we were unable
              to read any of the file; we handle what we could get from the
              file. */
+          cf_callback_invoke(cf_cb_live_capture_finished, capture_opts->cf);
           break;
 
         case CF_READ_ABORTED:
           /* Exit by leaving the main loop, so that any quit functions
              we registered get called. */
           main_window_quit();
+          cf_callback_invoke(cf_cb_live_capture_finished, capture_opts->cf);
         }
 
     } else {
         /* this is a normal mode capture, read in the capture file data */
         capture_input_read_all(capture_opts, cf_is_tempfile(capture_opts->cf), 
             cf_get_drops_known(capture_opts->cf), cf_get_drops(capture_opts->cf));
+        cf_callback_invoke(cf_cb_live_capture_finished, capture_opts->cf);
     }
 
-    cf_callback_invoke(cf_cb_live_capture_finished, capture_opts->cf);
-
     /* We're not doing a capture any more, so we don't have a save file. */
     g_assert(capture_opts->save_file);
     g_free(capture_opts->save_file);