feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Small tweaks to NTFS writable check fix

Browse Source
This commit is contained in:
Thorbjørn Lindeijer
2009-04-14 12:18:23 +02:00
parent 1898c4dbff
commit c3a3ab9664
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1173,9 +1173,8 @@ bool EditorManager::saveFile(IEditor *editor)
return true; return true;
} }
if (file->isReadOnly() || fileName.isEmpty()) { if (file->isReadOnly() || fileName.isEmpty())
return saveFileAs(editor); return saveFileAs(editor);
}
m_d->m_core->fileManager()->blockFileChange(file); m_d->m_core->fileManager()->blockFileChange(file);
const bool success = file->save(fileName); const bool success = file->save(fileName);

12
src/plugins/texteditor/basetextdocument.cpp
View File

@@ -146,15 +146,14 @@ bool BaseTextDocument::isReadOnly() const
const QFileInfo fi(m_fileName); const QFileInfo fi(m_fileName);
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
// be careful when getting info from files on network drives // Check for permissions on NTFS file systems
int old_ntfs_permission_lookup = qt_ntfs_permission_lookup; qt_ntfs_permission_lookup++;
qt_ntfs_permission_lookup = 1;
#endif #endif
const int ro = !fi.isWritable(); const bool ro = !fi.isWritable();
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
qt_ntfs_permission_lookup = old_ntfs_permission_lookup; qt_ntfs_permission_lookup--;
#endif #endif
return ro; return ro;
} }
@@ -175,9 +174,6 @@ bool BaseTextDocument::open(const QString &fileName)
if (!file.exists()) if (!file.exists())
return false; return false;
if (!fi.isReadable())
return false;
if (!file.open(QIODevice::ReadWrite) && !file.open(QIODevice::ReadOnly)) if (!file.open(QIODevice::ReadWrite) && !file.open(QIODevice::ReadOnly))
return false; return false;