- check now for the storage media flag "check =" in DocumentListPrivate::appendDocpath

- fixed a possible segmentation fault in DocumentListPrivate::nextFile

1 files changed, 7 insertions, 0 deletions

diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 39dc7c9..63f853e 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -420,48 +420,52 @@ DocumentListPrivate::DocumentListPrivate( ServerInterface *gui )
     } else {
         sendAppLnks = false;
         sendDocLnks = false;
     }
     for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) {
         listDirs[i] = 0;
         lists[i] = 0;
         listPositions[i] = 0;
     }
     initialize();
     tid = 0;
 }
 
 void DocumentListPrivate::appendDocpath(FileSystem*fs)
 {
     QDir defPath(fs->path()+"/Documents");
     QFileInfo f(fs->path()+"/.opiestorage.cf");
     if (!f.exists()) {
         Mediadlg dlg(fs);
         if (QDialog::Accepted != QPEApplication::execDialog( &dlg )) {
             return;
         }
     }
     Config conf(f.filePath(), Config::File );
+    conf.setGroup("main");
+    if (!conf.readBoolEntry("check",false)) {
+        return;
+    }
     conf.setGroup("subdirs");
     bool read_all = conf.readBoolEntry("wholemedia",true);
     if (read_all) {
         docPaths+=fs->path();
         return;
     }
     QStringList subDirs = conf.readListEntry("subdirs",':');
     if (subDirs.isEmpty()) {
         if (defPath.exists()) {
             docPaths+=defPath.path();
         }
         return;
     }
     for (unsigned c = 0; c < subDirs.count();++c) {
         QDir docDir(QString(fs->path()+"/"+subDirs[c]));
         if (docDir.exists()) {
             docPaths+=docDir.path();
         }
     }
 }
 
 void DocumentListPrivate::initialize()
 {
     // Reset
@@ -539,48 +543,51 @@ void DocumentListPrivate::estimatedPercentScanned()
 
 
 const QString DocumentListPrivate::nextFile()
 {
     while ( TRUE ) {
         while ( searchDepth < 0 ) {
             // go to next base path
             if ( docPathsSearched >= docPaths.count() ) {
                 // end of base paths
                 return QString::null;
             } else {
                 QDir dir( docPaths[docPathsSearched] );
                 // qDebug("now using base path: %s", docPaths[docPathsSearched].latin1() );
                 docPathsSearched++;
                 if ( !dir.exists( ".Qtopia-ignore" ) ) {
                     listDirs[0] = new QDir( dir );
                     lists[0] = listDirs[0]->entryInfoList();
                     listPositions[0] = 0;
                     searchDepth = 0;
                 }
             }
         }
 
         const QFileInfoList *fil = lists[searchDepth];
+    if (!fil) {
+        return QString::null;
+    }
         QFileInfoList *fl = (QFileInfoList *)fil;
         unsigned int pos = listPositions[searchDepth];
 
         if ( pos >= fl->count() ) {
             // go up a depth
             delete listDirs[searchDepth];
             listDirs[searchDepth] = 0;
             lists[searchDepth] = 0;
             listPositions[searchDepth] = 0;
             searchDepth--;
         } else {
             const QFileInfo *fi = fl->at(pos);
             listPositions[searchDepth]++;
             QString bn = fi->fileName();
             if ( bn[0] != '.' ) {
                 if ( fi->isDir()  ) {
                     if ( bn != "CVS" && bn != "Qtopia" && bn != "QtPalmtop" ) {
                         // go down a depth
                         QDir dir( fi->filePath() );
                         // qDebug("now going in to path: %s", bn.latin1() );
                         if ( !dir.exists( ".Qtopia-ignore" ) ) {
                             if ( searchDepth < MAX_SEARCH_DEPTH - 1) {
                                 searchDepth++;
                                 listDirs[searchDepth] = new QDir( dir );