diff options
author | Arno <am@disconnect.de> | 2014-12-10 22:10:50 +0100 |
---|---|---|
committer | Arno <am@disconnect.de> | 2014-12-10 22:10:50 +0100 |
commit | 2c022561f692a813b44da39d6ffdcb373aa4c7ba (patch) | |
tree | a500c3623572e1230b12b2302b00bf558502dadd /filesystemwidget.cpp | |
parent | 343d3db5f5ad571527a7ca70457cbb6ccb1bbb71 (diff) | |
download | SheMov-2c022561f692a813b44da39d6ffdcb373aa4c7ba.tar.gz SheMov-2c022561f692a813b44da39d6ffdcb373aa4c7ba.tar.bz2 SheMov-2c022561f692a813b44da39d6ffdcb373aa4c7ba.zip |
Various Bugfixes and cleanups
* remove debug statements from SmDirWatcher
* Don't crash on parentDir when current Dir is already deleted
* Fix PicFilesModel MappingQuery. It needlessly referenced the table
pics in FROM causing an expensive full table scan!
* Fix findRecursive in PicFilesModel: Stupid typo!
* Give SmDirWatcher a separate DB-Connection. One Thread, one Connection
* Remove several includes
This should have been 6 commits, but that's how debugging works :(
Diffstat (limited to 'filesystemwidget.cpp')
-rw-r--r-- | filesystemwidget.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp index 779db2e..60c2d78 100644 --- a/filesystemwidget.cpp +++ b/filesystemwidget.cpp @@ -227,11 +227,18 @@ void FilesystemWidget::fileViewActivated(const QModelIndex &idx){ void FilesystemWidget::parentDir(){ QModelIndex idx = mDirView->currentIndex(); + QModelIndex prev = idx.sibling(idx.row() - 1, idx.column()); + QString pName; + if(prev.isValid()){ + pName = idx.data().toString(); + } + QString sel = idx.data().toString(); if(idx.parent().isValid()){ mDirView->setCurrentIndex(idx.parent()); - } - QString sel = idx.data().toString(); - emit upSelected(sel); + } + if(!pName.isEmpty()){ + emit upSelected(sel); + } } void FilesystemWidget::goBack(){ |