Linux build fixed; minor CPanelWidget mutex refactoring

VioletGiraffe · Apr 4, 2019 · f71b84b · f71b84b
1 parent e656d27
commit f71b84b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -193,3 +193,5 @@ Makefile.Release
 .qmake.stash
 *.dmg
 .DS_Store
+
+*.8-pre1
diff --git a/file-commander-core/src/cpanel.cpp b/file-commander-core/src/cpanel.cpp
@@ -258,14 +258,24 @@ void CPanel::refreshFileList(FileListRefreshCause operation)
 	_workerThreadPool.enqueue([this, operation]() {
 		QFileInfoList list;
 
+		bool currentPathIsAccessible = false;
+		QString currentDirPath;
+
 		{
 			std::lock_guard<std::recursive_mutex> locker(_fileListAndCurrentDirMutex);
 
-			if (!pathIsAccessible(_currentDirObject.fullAbsolutePath()))
-			{
-				setPath(_currentDirObject.fullAbsolutePath(), operation); // setPath will itself find the closest best folder to set instead
-				return;
-			}
+			currentDirPath = _currentDirObject.fullAbsolutePath();
+			currentPathIsAccessible = pathIsAccessible(currentDirPath);
+		}
+
+		if (!currentPathIsAccessible)
+		{
+			setPath(currentDirPath, operation); // setPath will itself find the closest best folder to set instead
+			return;
+		}
+
+		{
+			std::lock_guard<std::recursive_mutex> locker(_fileListAndCurrentDirMutex);
 
 			list = _currentDirObject.qDir().entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDot | QDir::Hidden | QDir::System);
 			_items.clear();

diff --git a/file-commander-core/src/diskenumerator/volumeinfohelper.hpp b/file-commander-core/src/diskenumerator/volumeinfohelper.hpp
@@ -12,6 +12,10 @@ RESTORE_COMPILER_WARNINGS
 #include <sys/mount.h>
 #include <errno.h>
 
+#ifdef __linux__
+#include <sys/vfs.h> // statfs64
+#endif
+
 inline struct statfs64 volumeInfoForPath(const QString& path)
 {
 	struct statfs64 info;