diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-09-09 19:30:19 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-09-09 19:30:19 +0000 |
| commit | 41174fa490f141aaf1fdddfcb4f445ecd95888f7 (patch) | |
| tree | f23ab50a6829f2d05bc735530a51ea1d0bbd8154 /ui | |
| parent | fef81954abcf36e635579e5d581c1a3ed88ec0ad (diff) | |
if display_filter is NULL, qtshark crash...
svn path=/trunk/; revision=51882
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 3dda0dca78..9cef7b6442 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -182,7 +182,10 @@ void MainWindow::openCaptureFile(QString &cf_path, QString &display_filter) } // get_dirname overwrites its path. Hopefully this isn't a problem. wsApp->setLastOpenDir(get_dirname(cf_path.toUtf8().data())); - df_combo_box_->setEditText(display_filter); + if(display_filter != NULL) + { + df_combo_box_->setEditText(display_filter); + } main_ui_->statusBar->showExpert(); } |