nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove autostart commands after they have been executed. 

As there is no need to keep autostart commands in memory, we can safely
remove them as soon as they have been executed. As we previously didn't
clear them at all during config reloads, this also fixes a memory leak.

Note that neither autostarts nor autostarts_always is executed during
config reloads, so removing them from memory is fine as an i3 restart
will cause them to be parsed again.

fixes #2044
This commit is contained in:
Ingo Bürk 2015-11-02 09:21:43 -05:00
parent bb7a36e0c7
commit f2209a873c
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@ -819,18 +819,28 @@ int main(int argc, char *argv[]) {
/* Autostarting exec-lines */ /* Autostarting exec-lines */
if (autostart) { if (autostart) {
struct Autostart *exec; while (!TAILQ_EMPTY(&autostarts)) {
TAILQ_FOREACH(exec, &autostarts, autostarts) { struct Autostart *exec = TAILQ_FIRST(&autostarts);
LOG("auto-starting %s\n", exec->command); LOG("auto-starting %s\n", exec->command);
start_application(exec->command, exec->no_startup_id); start_application(exec->command, exec->no_startup_id);
FREE(exec->command);
TAILQ_REMOVE(&autostarts, exec, autostarts);
FREE(exec);
} }
} }
/* Autostarting exec_always-lines */ /* Autostarting exec_always-lines */
struct Autostart *exec_always; while (!TAILQ_EMPTY(&autostarts_always)) {
TAILQ_FOREACH(exec_always, &autostarts_always, autostarts_always) { struct Autostart *exec_always = TAILQ_FIRST(&autostarts_always);
LOG("auto-starting (always!) %s\n", exec_always->command); LOG("auto-starting (always!) %s\n", exec_always->command);
start_application(exec_always->command, exec_always->no_startup_id); start_application(exec_always->command, exec_always->no_startup_id);
FREE(exec_always->command);
TAILQ_REMOVE(&autostarts_always, exec_always, autostarts_always);
FREE(exec_always);
} }
/* Start i3bar processes for all configured bars */ /* Start i3bar processes for all configured bars */