fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hooks.c: Fix window preparation in interactive mode

Browse Source 
In commit 2857bac (Fix segfault when running hooks in non-interactive
mode, 2016-01-16), we added checks to fix a segmentation fault in
non-interactive mode. However, at the same time, that commit broke
window preparation in interactive mode.

When wins_prepare_external() is called, the UI mode is changed to
command line, such that we cannot determine whether we need to call
wins_unprepare_external() when returning from the hook. As a workaround,
we now store the mode in a temporary variable.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2016-02-07 13:47:02 +01:00
parent e7a83118ea
commit 537b2859f2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hooks.c
View File

@ -43,6 +43,7 @@ int run_hook(const char *name)
char *hook_path;
char const *arg[2];
int pid, ret = -127;
int prepare_wins = (ui_mode == UI_CURSES);
asprintf(&hook_path, "%s/%s", path_hooks, name);
arg[0] = hook_path;
@ -51,7 +52,7 @@ int run_hook(const char *name)
if (!io_file_exists(hook_path))
return 0;
if (ui_mode == UI_CURSES)
if (prepare_wins)
wins_prepare_external();
if ((pid = shell_exec(NULL, NULL, *arg, arg))) {
@ -60,7 +61,7 @@ int run_hook(const char *name)
press_any_key();
}
if (ui_mode == UI_CURSES)
if (prepare_wins)
wins_unprepare_external();
return ret;