Config backend fixups #2006
Merged
Config backend fixups #2006
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
soreau
force-pushed
the
config-backend-fixups
branch
3 times, most recently
from
be9361a
to
a9b84a3
Compare
ammen99
approved these changes
Nov 15, 2023
src/default-config-backend.cpp
Outdated
| @@ -53,7 +53,7 @@ static int handle_config_updated(int fd, uint32_t mask, void *data) | |||
|
|
|||
| const auto last_slash = config_file.find_last_of('/'); | |||
There was a problem hiding this comment.
I guess we can use the built-in std::filesystem functions here to get the base file name? https://en.cppreference.com/w/cpp/filesystem/path/filename
| { | ||
| inotify_rm_watch(fd, wd_cfg_file); | ||
| wd_cfg_file = | ||
| inotify_add_watch(fd, (config_dir + "/" + cfg_file_basename).c_str(), IN_CLOSE_WRITE); |
There was a problem hiding this comment.
I wonder, do we need to concatenate the two files here, isn't this basically config_file.c_str() here?
There was a problem hiding this comment.
It would be, except in the case where the config file is specified as a relative path. I wanted to make sure the file path we're watching is complete and not rely on relative paths.
…nfig file When running wayfire with or by setting WAYFIRE_CONFIG_FILE, the config directory wasn't being set, causing instances pointing to a config file that did not exist when wayfire started to have no effect on config reload.
We should only need to add a watch when the config file is created in the config directory and once for the directory.
soreau
force-pushed
the
config-backend-fixups
branch
from
a9b84a3
to
9245f29
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.