diff options
Diffstat (limited to 'ui/qt/main_window.cpp')
| -rw-r--r-- | ui/qt/main_window.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 380ef7e357..0336b27d52 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1276,8 +1276,7 @@ void MainWindow::mergeCaptureFile() g_free(in_filenames[1]); if (merge_status != CF_OK) { - if (rfcode != NULL) - dfilter_free(rfcode); + dfilter_free(rfcode); g_free(tmpname); continue; } @@ -1289,8 +1288,7 @@ void MainWindow::mergeCaptureFile() if (cf_open(CaptureFile::globalCapFile(), tmpname, WTAP_TYPE_AUTO, TRUE /* temporary file */, &err) != CF_OK) { /* We couldn't open it; fail. */ CaptureFile::globalCapFile()->window = NULL; - if (rfcode != NULL) - dfilter_free(rfcode); + dfilter_free(rfcode); g_free(tmpname); return; } |