author | zecke <zecke> | 2002-04-23 17:18:31 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-04-23 17:18:31 (UTC) |
commit | adf10e0e160b18fe329b6baccf5dc666d612fe8e (patch) (unidiff) | |
tree | afe9af2b6a884ef31ce64e22f2a6fbcfb839742a /core/launcher/launcher.cpp | |
parent | 20959a35ed4ffa132643968b23d9af74003b41a2 (diff) | |
download | opie-adf10e0e160b18fe329b6baccf5dc666d612fe8e.zip opie-adf10e0e160b18fe329b6baccf5dc666d612fe8e.tar.gz opie-adf10e0e160b18fe329b6baccf5dc666d612fe8e.tar.bz2 |
fix the bugs
-rw-r--r-- | core/launcher/launcher.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index d1df4cc..f9c6c02 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -557,6 +557,8 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global:: | |||
557 | StorageInfo storage; | 557 | StorageInfo storage; |
558 | const QList<FileSystem> &fileSystems = storage.fileSystems(); | 558 | const QList<FileSystem> &fileSystems = storage.fileSystems(); |
559 | QListIterator<FileSystem> it ( fileSystems ); | 559 | QListIterator<FileSystem> it ( fileSystems ); |
560 | |||
561 | |||
560 | for ( ; it.current(); ++it ) { | 562 | for ( ; it.current(); ++it ) { |
561 | if ( (*it)->isRemovable() ) { // let's find out if we should search on it | 563 | if ( (*it)->isRemovable() ) { // let's find out if we should search on it |
562 | qWarning("%s is removeable", (*it)->path().latin1() ); | 564 | qWarning("%s is removeable", (*it)->path().latin1() ); |
@@ -573,12 +575,16 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global:: | |||
573 | delete tmp; | 575 | delete tmp; |
574 | 576 | ||
575 | }else{ // come up with the gui cause this a new card | 577 | }else{ // come up with the gui cause this a new card |
576 | MediumMountGui medium((*it)->path() ); | 578 | MediumMountGui medium(&cfg, (*it)->path() ); |
577 | if( medium.check() ){ // we did not ask before or ask again is off | 579 | if( medium.check() ){ // we did not ask before or ask again is off |
578 | if( medium.exec() ){ // he clicked yes so search it | 580 | if( medium.exec() ){ // he clicked yes so search it |
579 | // speicher | 581 | // speicher |
580 | cfg.read(); // cause of a race we need to reread | 582 | //cfg.read(); // cause of a race we need to reread - fixed |
581 | cfg.writeEntry("timestamp", newStamp ); | 583 | cfg.writeEntry("timestamp", newStamp ); |
584 | cfg.write(); | ||
585 | tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) ); | ||
586 | docsFolder->appendFrom( *tmp ); | ||
587 | delete tmp; | ||
582 | }// no else | 588 | }// no else |
583 | }else{ // we checked | 589 | }else{ // we checked |
584 | // do something different see what we need to do | 590 | // do something different see what we need to do |