diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-07 17:05:17 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-03-06 11:41:54 +0000 |
| commit | 56aaa5b705fc87830a0f74f0ad34997ed76f7c92 (patch) | |
| tree | dd6ec6c8d7fee0aa341b5a3b4b2ff136089c36ba /ui/qt/conversation_dialog.cpp | |
| parent | cfa50019b6366404f54da57700e50862aa87ebb0 (diff) | |
| download | wireshark-56aaa5b705fc87830a0f74f0ad34997ed76f7c92.tar.gz | |
Switch conversations to use wmem_tree_t instead of (sorted) GSList.
Change-Id: Ifaf25ca5a7974f1d398ceebbb4c6733d4d3e001a
Reviewed-on: https://code.wireshark.org/review/20006
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/conversation_dialog.cpp')
| -rw-r--r-- | ui/qt/conversation_dialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index be43a2e04b..cf712f9f0d 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -92,7 +92,7 @@ ConversationDialog::ConversationDialog(QWidget &parent, CaptureFile &cf, int cli } // Bring the command-line specified type to the front. - if (get_conversation_by_proto_id(cli_proto_id)) { + if ((cli_proto_id > 0) && (get_conversation_by_proto_id(cli_proto_id))) { conv_protos.removeAll(cli_proto_id); conv_protos.prepend(cli_proto_id); } |