From f3f80c14991779433c9a1eb13554d846a33205c6 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 4 Jan 2001 17:27:21 +0000 Subject: [PATCH] Allow stopping signal more than once without sending GLib warning git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1061 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/core/signals.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/signals.c b/src/core/signals.c index d1416a79..b15cce32 100644 --- a/src/core/signals.c +++ b/src/core/signals.c @@ -282,9 +282,9 @@ void signal_stop(void) SIGNAL_REC *rec; rec = current_emitted_signal; - if (rec == NULL || rec->emitting <= rec->stop_emit) + if (rec == NULL) g_warning("signal_stop() : no signals are being emitted currently"); - else + else if (rec->emitting > rec->stop_emit) rec->stop_emit++; } @@ -298,9 +298,7 @@ void signal_stop_by_name(const char *signal) rec = g_hash_table_lookup(signals, GINT_TO_POINTER(signal_id)); if (rec == NULL) g_warning("signal_stop_by_name() : unknown signal \"%s\"", signal); - else if (rec->emitting <= rec->stop_emit) - g_warning("signal_stop_by_name() : signal \"%s\" not being emitted", signal); - else + else if (rec->emitting > rec->stop_emit) rec->stop_emit++; }