Merge branch 'master' into thesis/2019/camera-paths

# Conflicts:
#	src/navigation/navigationhandler.cpp
This commit is contained in:
Emma Broman
2021-06-23 16:31:14 +02:00
112 changed files with 1007 additions and 519 deletions
+1 -1
View File
@@ -2103,7 +2103,7 @@ std::vector<std::string> SessionRecording::playbackList() const {
DWORD attributes = GetFileAttributes(e.path().string().c_str());
bool isHidden = attributes & FILE_ATTRIBUTE_HIDDEN;
#else
bool isHidden = filename.rfind(".", 0) != 0;
bool isHidden = filename.find(".") == 0;
#endif // WIN32
if (!isHidden) {
// Don't add hidden files