aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2016-11-28 08:58:10 -0500
committerKen Moore <ken@ixsystems.com>2016-11-28 08:58:10 -0500
commit24d88d1ac4d316da3527b236c6cedb2b4a90bc85 (patch)
tree77c02cdaba7150c7a3c5c4fbd436344fa6401473
parentFix up the loading of the "show hidden files" option at the start of a browse... (diff)
downloadlumina-24d88d1ac4d316da3527b236c6cedb2b4a90bc85.tar.gz
lumina-24d88d1ac4d316da3527b236c6cedb2b4a90bc85.tar.bz2
lumina-24d88d1ac4d316da3527b236c6cedb2b4a90bc85.zip
Fix up the regular expression strip of the ZFS snapshot from the full path.
-rw-r--r--src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
index 29adf09d..48ad6aa5 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -513,7 +513,8 @@ void DirWidget::currentDirectoryChanged(bool widgetonly){
qDebug() << "Changed to directory:" << cur;
}else{
//Re-assemble the normalbasedir variable (in case moving around within a snapshot)
- normalbasedir = cur.replace( QRegExp("/\\.zfs/snapshot/(.)+/"), "/" );
+ normalbasedir = cur;
+ normalbasedir.replace( QRegExp("\\/\\.zfs\\/snapshot/([^/]+)\\/"), "/" );
qDebug() << "Changed to snapshot:" << cur << normalbasedir;
}
ui->actionBack->setEnabled( currentBrowser()->history().length()>1 );
bgstack15