Fix a Crash when using All Files.. as name and default() returns 0l

Fix a Crash in reparse when the chooser is not yet initialized

1 files changed, 7 insertions, 7 deletions

diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index 7f38f5b..4ab744c 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -241,20 +241,20 @@ bool OFileSelector::cd(const QString &path )
 void OFileSelector::setSelector(int mode )
 {
   QString text;
   switch( mode ){
   case Normal:
     text = tr("Documents");
     break;
   case Extended:
-    text = tr("Files");
+    text = tr("List View");
     break;
   case ExtendedAll:
-    text = tr("All Files");
+    text = tr("All List View");
     break;
   }
   slotViewCheck( text );
 }
 
 void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ )
 {
 /*  m_custom = popup;
@@ -461,16 +461,18 @@ void OFileSelector::locationComboChanged()
 void OFileSelector::init()
 {
   initFactory();
   m_lay = new QVBoxLayout( this );
   m_lay->setSpacing(0 );
 
   /* take care of the main view... */
   initToolbar();
+  //if( m_shChooser ) // the Chooser for the view and Mimetypes
+  initializeChooser();
 
   /* initialize the file lister */
   if( m_selector == Normal ){
       QString mime;
       if (!m_autoMime) {
           if (!m_mimetypes.isEmpty() ) {
               QMap<QString, QStringList>::Iterator it;
               it = m_mimetypes.begin(); // cause we're in the init
@@ -483,19 +485,16 @@ void OFileSelector::init()
   }
 
   if( m_shLne ) // the LineEdit with the current FileName
       initializeName();
 
   if( m_shPerm ) // the Permission QCheckBox
       initializePerm();
 
-  if( m_shChooser ) // the Chooser for the view and Mimetypes
-      initializeChooser();
-
   if( m_shYesNo ) // the Yes No button row
       initializeYes( );
 
   if (m_selector != Normal )
       reparse();
 }
 void OFileSelector::updateMimes()
 {
@@ -951,16 +950,17 @@ void OFileSelector::setView( const QString& lis ) {
     if ( lis == tr("Documents") ) {
         m_selector = Normal;
         delete m_lister;
         delete m_fileView;
         m_lister = 0l;
         m_fileView = 0l;
         initializeOldSelector();
     }else {
+        qWarning("lis %s", lis.latin1() );
         QString list;
 
         delete m_lister;
         delete m_fileView;
         delete m_select;
         m_lister =0l;
         m_fileView = 0l;
         m_select = 0l;
@@ -1087,14 +1087,14 @@ void OFileSelector::initializeOldSelector() {
  * with QString::null to get the default
  * setView with either Files or All Files
  * depending on Extended
  */
 void OFileSelector::initializeView() {
     setLister(QString::null);
     fillList();
     if (m_selector == Extended ) {
-        setView( tr("Files") );
+        setView( tr("List View") );
     }else{
-        setView( tr("All Files") );
+        setView( tr("All List View") );
     }
 }