Fixed a regression in 8fa44842.

[mutilities/MUtilities.git] / src / DirLocker.h

diff --git a/src/DirLocker.h b/src/DirLocker.h
index ceb94f5..d06d86d 100644 (file)
--- a/src/DirLocker.h
+++ b/src/DirLocker.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // MuldeR's Utilities for Qt
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -64,13 +64,16 @@ namespace MUtils
                                }
                                for(int i = 0; i < 32; i++)
                                {
-                                       m_lockFile.reset(new QFile(QString("%1/~%2.lck").arg(m_dirPath, MUtils::rand_str())));
+                                       m_lockFile.reset(new QFile(QString("%1/~%2.lck").arg(m_dirPath, MUtils::next_rand_str())));
                                        if(m_lockFile->open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Unbuffered))
                                        {
                                                if(m_lockFile->write(testData) >= testData.size())
                                                {
-                                                       okay = true;
-                                                       break;
+                                                       if(m_lockFile->error() == QFile::NoError)
+                                                       {
+                                                               okay = true;
+                                                               break;
+                                                       }
                                                }
                                                m_lockFile->remove();
                                        }
@@ -86,27 +89,19 @@ namespace MUtils
                                bool okay = false;
                                if(!m_lockFile.isNull())
                                {
-                                       for(int i = 0; i < 8; i++)
+                                       for(int i = 0; i < 16; i++)
                                        {
-                                               if(m_lockFile->remove())
+                                               if(m_lockFile->remove() || (!m_lockFile->exists()))
                                                {
+                                                       okay = true;
                                                        break;
                                                }
-                                               OS::sleep_ms(1);
-                                       }
-                               }
-                               for(int i = 0; i < 8; i++)
-                               {
-                                       if(MUtils::remove_directory(m_dirPath))
-                                       {
-                                               okay = true;
-                                               break;
+                                               OS::sleep_ms(125);
                                        }
-                                       OS::sleep_ms(1);
                                }
                                if(!okay)
                                {
-                                       OS::system_message_wrn(L"Directory Lock", L"Warning: Not all temporary files could be removed!");
+                                       qWarning("DirLock: The lock file could not be removed!");
                                }
                        }