Merged with Irssi 0.8.6.

[silc.git] / apps / irssi / src / perl / common / Expando.xs

diff --git a/apps/irssi/src/perl/common/Expando.xs b/apps/irssi/src/perl/common/Expando.xs
index d3a232f7c4e66d85495dcfe5ea48dc7eb49c2260..08f5c202214e537f9b2c14a4c4d4f8c590b41863 100644 (file)
--- a/apps/irssi/src/perl/common/Expando.xs
+++ b/apps/irssi/src/perl/common/Expando.xs
@@ -71,13 +71,13 @@ static char *perl_expando_event(PerlExpando *rec, SERVER_REC *server,
        retcount = perl_call_sv(rec->func, G_EVAL|G_SCALAR);
        SPAGAIN;
 
+       ret = NULL;
        if (SvTRUE(ERRSV)) {
                /* make sure we don't get back here */
                if (rec->script != NULL)
                        script_unregister_expandos(rec->script);
 
                signal_emit("script error", 2, rec->script, SvPV(ERRSV, PL_na));
-               ret = NULL;
        } else if (retcount > 0) {
                ret = g_strdup(POPp);
                *free_ret = TRUE;