summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-26 22:45:27 (UTC)
committer kergoth <kergoth>2003-01-26 22:45:27 (UTC)
commit954ff2a858b34a8249314340f799f0a74426d59c (patch) (unidiff)
treef0b738dceaec14bba0347151db4f372d25cdf8e8
parent4ce67fbdfb5e82bbde3a8963d3e956567438689d (diff)
downloadopie-954ff2a858b34a8249314340f799f0a74426d59c.zip
opie-954ff2a858b34a8249314340f799f0a74426d59c.tar.gz
opie-954ff2a858b34a8249314340f799f0a74426d59c.tar.bz2
Added two missing dir.exists() checks, without which a segfault occurs if m_currentDir doesnt exist.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/ofileselector.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 6a6a300..7481360 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -1202,6 +1202,7 @@ void OFileSelector::reparse()
1202 1202
1203 // let's find possible mimetypes 1203 // let's find possible mimetypes
1204 QDir dir( m_currentDir ); 1204 QDir dir( m_currentDir );
1205 if( dir.exists() ){
1205 dir.setFilter( QDir::Files | QDir::Readable ); 1206 dir.setFilter( QDir::Files | QDir::Readable );
1206 dir.setSorting( QDir::Size ); 1207 dir.setSorting( QDir::Size );
1207 const QFileInfoList *list = dir.entryInfoList(); 1208 const QFileInfoList *list = dir.entryInfoList();
@@ -1225,6 +1226,7 @@ void OFileSelector::reparse()
1225 m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) ); 1226 m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) );
1226 currentMimeType = m_mimeCheck->currentText(); 1227 currentMimeType = m_mimeCheck->currentText();
1227 } 1228 }
1229 }
1228 }else { // no autoMime 1230 }else { // no autoMime
1229 // let the mimetype be set from out side the m_mimeCheck FEATURE 1231 // let the mimetype be set from out side the m_mimeCheck FEATURE
1230 1232
@@ -1237,6 +1239,7 @@ void OFileSelector::reparse()
1237 1239
1238 QDir dir( m_currentDir ); 1240 QDir dir( m_currentDir );
1239 1241
1242 if( dir.exists() ){
1240 int sort; 1243 int sort;
1241 if ( m_case ) 1244 if ( m_case )
1242 sort = (QDir::IgnoreCase | QDir::Name | QDir::DirsFirst | QDir::Reversed); 1245 sort = (QDir::IgnoreCase | QDir::Name | QDir::DirsFirst | QDir::Reversed);
@@ -1290,6 +1293,7 @@ void OFileSelector::reparse()
1290 //qWarning( "%s", fi->fileName().latin1() ); 1293 //qWarning( "%s", fi->fileName().latin1() );
1291 ++it; 1294 ++it;
1292 } // of while loop 1295 } // of while loop
1296 } // if ( dir.exists() )
1293 m_View->sort(); 1297 m_View->sort();
1294 if( m_shTool ){ 1298 if( m_shTool ){
1295 m_location->insertItem( m_currentDir ); 1299 m_location->insertItem( m_currentDir );