aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2015-05-18 13:05:51 -0400
committerKen Moore <ken@pcbsd.org>2015-05-18 13:05:51 -0400
commit2b6ede9432ea7c947aa1d5a98762ee4dc2d5e3fc (patch)
tree4474ba9ae0665a8857d1de7d82e21c12078c680d
parentFix a bug in lumina-config where saving settings during a screen change was s... (diff)
downloadlumina-2b6ede9432ea7c947aa1d5a98762ee4dc2d5e3fc.tar.gz
lumina-2b6ede9432ea7c947aa1d5a98762ee4dc2d5e3fc.tar.bz2
lumina-2b6ede9432ea7c947aa1d5a98762ee4dc2d5e3fc.zip
Fix a bug in the background snapshot finder: the new simplification routine was incorrectly being used, because the variable being checked was set just moments before (resulting in it always re-using the first snapshot directory found)
-rw-r--r--lumina-fm/BackgroundWorker.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lumina-fm/BackgroundWorker.cpp b/lumina-fm/BackgroundWorker.cpp
index 02d2f02e..f8e036ac 100644
--- a/lumina-fm/BackgroundWorker.cpp
+++ b/lumina-fm/BackgroundWorker.cpp
@@ -42,16 +42,18 @@ void BackgroundWorker::startDirChecks(QString path){
qDebug() << " - done with audio/multimedia checks";
//Now check for ZFS snapshots of the directory
if(!QFileInfo(path).isWritable() ){ return; } //skip ZFS checks if can't restore to this dir
- cdir = path;
+ //cdir = path;
QStringList snapDirs;
QString baseSnapDir;
bool found = false;
qDebug() << " - start searching for base snapshot directory";
if(cdir == path && QFile::exists(csnapdir) ){
//no need to re-search for it - just found it recently
+ qDebug() << " -- Use previous dir:" << cdir << csnapdir;
baseSnapDir= csnapdir; found=true;
}else{
while(dir.canonicalPath()!="/" && !found){
+ qDebug() << " -- Checking for snapshot dir:" << dir.canonicalPath();
if(dir.exists(".zfs/snapshot")){
baseSnapDir = dir.canonicalPath()+"/.zfs/snapshot";
found = true;
bgstack15