summaryrefslogtreecommitdiff
path: root/lib/dir_lock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/dir_lock.cpp')
-rw-r--r--lib/dir_lock.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/dir_lock.cpp b/lib/dir_lock.cpp
index ab3c84ea..9ca76310 100644
--- a/lib/dir_lock.cpp
+++ b/lib/dir_lock.cpp
@@ -447,10 +447,6 @@ bool tryLock(const Zstring& lockfilename) //throw FileError
NULL);
if (fileHandle == INVALID_HANDLE_VALUE)
{
-#ifndef _MSC_VER
-#warning fix this problem!
- //read-only FTP may return: ERROR_FILE_EXISTS (NetDrive @ GNU)
-#endif
if (::GetLastError() == ERROR_FILE_EXISTS)
return false;
else
@@ -545,7 +541,7 @@ public:
return activeLock;
}
}
- catch (...) {} //catch everything, let SharedDirLock constructor deal with errors, e.g. 0-sized/corrupted lock file
+ catch (FileError&) {} //catch everything, let SharedDirLock constructor deal with errors, e.g. 0-sized/corrupted lock file
//not yet in buffer, so create a new directory lock
std::shared_ptr<SharedDirLock> newLock(new SharedDirLock(lockfilename, callback)); //throw FileError
bgstack15