Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-04-25 07:18:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix possible file watcher crash

Browse Source
This commit is contained in:
GriffinR 2025-07-29 14:12:51 -04:00
parent d3d30ae0f2
commit 5584a2d47b
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -36,6 +36,7 @@ and this project somewhat adheres to [Semantic Versioning](https://semver.org/sp
- Fix warning not appearing when the log file exceeds maximum size.
- Fix possible lag while using the Tileset Editor's tile selector.
- Fix unnecessary resources being used to watch files.
- Fix possible crash on Linux if too many inotify instances are requested.
## [6.1.0] - 2025-06-09
### Added

14
src/core/map.cpp
View File

@ -142,17 +142,27 @@ QStringList Map::getScriptLabels(Event::Group group) {
.arg(Util::stripPrefix(scriptsFilepath, projectConfig.projectDir() + "/"))
.arg(m_name)
.arg(error));
// Setting this flag here (and below) lets us skip some steps and logging if we already know it failed.
// Script labels may be re-requested often, so we don't want to fill the log with warnings.
m_loggedScriptsFileError = true;
}
if (porymapConfig.monitorFiles) {
if (porymapConfig.monitorFiles && !m_loggedScriptsFileError) {
if (!m_scriptFileWatcher) {
// Only create the file watcher when it's first needed (even an empty QFileSystemWatcher will consume system resources).
// The other option would be for Porymap to have a single global QFileSystemWatcher, but that has complications of its own.
m_scriptFileWatcher = new QFileSystemWatcher(this);
connect(m_scriptFileWatcher, &QFileSystemWatcher::fileChanged, this, &Map::invalidateScripts);
}
if (!m_scriptFileWatcher->files().contains(scriptsFilepath) && !m_scriptFileWatcher->addPath(scriptsFilepath) && !m_loggedScriptsFileError) {
// m_scriptFileWatcher can stil be nullptr here if the inotify limit was reached on Linux.
// Porymap isn't using enough resources in general for this to be a problem, but the user may have lowered the inotify limit.
if (!m_scriptFileWatcher) {
logWarn(QString("Failed to add scripts file '%1' to file watcher for %2: Reached system resource limit.")
.arg(Util::stripPrefix(scriptsFilepath, projectConfig.projectDir() + "/"))
.arg(m_name));
m_loggedScriptsFileError = true;
} else if (!m_scriptFileWatcher->files().contains(scriptsFilepath) && !m_scriptFileWatcher->addPath(scriptsFilepath)) {
logWarn(QString("Failed to add scripts file '%1' to file watcher for %2.")
.arg(Util::stripPrefix(scriptsFilepath, projectConfig.projectDir() + "/"))
.arg(m_name));