summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fe-common/core/fe-windows.c3
-rw-r--r--src/fe-common/core/printtext.c8
2 files changed, 9 insertions, 2 deletions
diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index fe76427b..38dd22fe 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -247,7 +247,8 @@ WINDOW_REC *window_find_level(void *server, int level)
GSList *tmp;
/* prefer active window if possible */
- if (WINDOW_LEVEL_MATCH(active_win, server, level))
+ if (active_win != NULL &&
+ WINDOW_LEVEL_MATCH(active_win, server, level))
return active_win;
for (tmp = windows; tmp != NULL; tmp = tmp->next) {
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index 36984219..dbd52343 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -415,9 +415,15 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text)
char *str, *tmp;
g_return_if_fail(dest != NULL);
- g_return_if_fail(dest->window != NULL);
g_return_if_fail(text != NULL);
+ if (dest->window == NULL) {
+ str = strip_codes(text);
+ printf("NO WINDOWS: %s\n", str);
+ g_free(str);
+ return;
+ }
+
msg_beep_check(dest);
if ((dest->level & MSGLEVEL_NEVER) == 0)