Changeset 12efc09f668bd490a5bdbdfc951183328e436770

Show
Ignore:
Timestamp:
11/29/07 23:22:40 (8 months ago)
Author:
Christophe Mutricy <xtophe@videolan.org>
git-committer:
Christophe Mutricy <xtophe@videolan.org> 1196374960 +0000
git-parent:

[bad2a6b1f230b3dafb5c47f28b117bbe69192e93]

git-author:
Christophe Mutricy <xtophe@videolan.org> 1196374960 +0000
Message:

Improve stability of the preferences dialog. Patch by Andre Weber

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • THANKS

    r59f74cc r12efc09  
    2020AndrĂ© de Barros Martins Ribeiro <andrerib at ajato.com.br> - Brazilian portuguese localization 
    2121Andre Pang <adre.pang at csiro dot au> - Annodex support 
     22Andre Weber <WeberAndre at gmx d0t de> - Qt4 patches 
    2223Andres Krapf <dae at via.ecp.fr> - FreeBSD port and tests, KDE interface 
    2324Andrey Brilevskiy <director at macwest.ru> - Russian translation 
  • modules/gui/qt4/dialogs/preferences.cpp

    r3ba76bd r12efc09  
    212212 
    213213    if( !data->panel ) 
     214    { 
    214215        data->panel = new AdvPrefsPanel( p_intf, main_panel , data ); 
     216        main_panel_l->addWidget( data->panel ); 
     217    } 
    215218 
    216219    advanced_panel = data->panel; 
    217     main_panel_l->addWidget( advanced_panel ); 
    218220    advanced_panel->show(); 
    219221} 
     
    278280    if( small->isChecked() && advanced_panel ) 
    279281    { 
    280         delete advanced_panel; 
     282        /* Deleting only the active panel from the advanced config doesn't work 
     283           because the data records of PrefsItemData  contains still a 
     284           reference to it only cleanAll() is sure to remove all Panels! */ 
     285        advanced_tree->cleanAll(); 
    281286        advanced_panel = NULL; 
    282287    } 
     
    285290        for( int i = 0 ; i< SPrefsMax; i++ ) 
    286291        { 
    287             if( simple_panels[i] ) delete simple_panels[i]; 
     292            if( simple_panels[i] ) 
     293            { 
     294               delete simple_panels[i]; 
     295               simple_panels[i] = NULL; 
     296            } 
    288297        } 
    289298        current_simple_panel  = NULL;