[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3a0da5fbb2c907eb90701275555aefd1a8e2415c
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

3a0da5f by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Create the main display filter combo sooner.
    
    Construct MainWindow::df_combo_box_ in our initializer list, otherwise
    anything that triggers a resizeEvent early on might result in an NPE.
    
    Wait until everything is in place before calling setMinimumWidth.
    
    Conflicts:
    	ui/qt/main_window.cpp
    
    Bug: 14979
    Change-Id: I78b349f9c3ea53d8b1399a77169bbbd0a4a69191
    Reviewed-on: https://code.wireshark.org/review/28728
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit 2cfa3013bc2890dd1ea8468366344c3d3878f3a0)
    Reviewed-on: https://code.wireshark.org/review/28746
    

Actions performed:

    from  d266d15   Updates for 2.6.2.
    adds  3a0da5f   Qt: Create the main display filter combo sooner.


Summary of changes:
 ui/qt/main_window.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)