[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 136757] "Move files to collection..." deletes directory if no
From:       Seb Ruiz <me () sebruiz ! net>
Date:       2007-05-21 11:50:33
Message-ID: 20070521115033.10711.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
         
http://bugs.kde.org/show_bug.cgi?id=136757         
me sebruiz net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From me sebruiz net  2007-05-21 13:50 -------
SVN commit 666959 by seb:

When organising files, only delete the parent directory if it is within the Collection heirarchy.
BUG: 136757


 M  +1 -4      collectiondb.cpp  


--- branches/stable/extragear/multimedia/amarok/src/collectiondb.cpp #666958:666959
 @ -4056,17 +4056,14  @
 
          if( !config.hasKey("Icon") )
          {
-            //config.writeEntry("Icon", QString("%1/.front.png").arg( path ));
             config.writeEntry( "Icon", cover );
             config.sync();
-            debug() << "Using this cover as icon for: " << path << endl;
-            debug() << cover << endl;
          }
          //}         //Not amazon nice.
       }
    }
 
-   if( localFile && QDir().rmdir( src.directory() ) )
+   if( localFile && isDirInCollection( src.directory() ) && QDir().rmdir( src.directory() ) )
    {
       debug() << "removed: " << src.directory() << endl;
    }
[prev in list] [next in list] [prev in thread] [next in thread]