From aeee1856eb3292a7d658cb3bf8eadb522db7f171 Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Tue, 13 Apr 2010 00:02:07 +0200
Subject: [PATCH] Fix bug with perl script filename when multiplicity is
 disabled (bug #29530)

---
 ChangeLog                               | 3 ++-
 src/plugins/scripts/perl/weechat-perl.c | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f670a5499..0d104dfe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 FlashCode <flashcode@flashtux.org>
-v0.3.2-dev, 2010-04-12
+v0.3.2-dev, 2010-04-13
 
 
 Version 0.3.2 (under dev!)
@@ -59,6 +59,7 @@ Version 0.3.2 (under dev!)
   (bug #29018)
 * perl: fix crash on /quit or unload of plugin under FreeBSD and Cygwin
   (bug #29467)
+* perl: fix bug with script filename when multiplicity is disabled (bug #29530)
 * irc: add SASL authentication, with PLAIN and DH-BLOWFISH mechanisms
   (task #8829)
 * irc: fix crash with SSL connection if option ssl_cert is set (bug #28752)
diff --git a/src/plugins/scripts/perl/weechat-perl.c b/src/plugins/scripts/perl/weechat-perl.c
index 100b1a136..63626a9d7 100644
--- a/src/plugins/scripts/perl/weechat-perl.c
+++ b/src/plugins/scripts/perl/weechat-perl.c
@@ -288,6 +288,7 @@ weechat_perl_load (const char *filename)
     }
     
     perl_current_script = NULL;
+    perl_current_script_filename = filename;
     perl_registered_script = NULL;
     
 #ifdef MULTIPLICITY
@@ -302,8 +303,6 @@ weechat_perl_load (const char *filename)
         return 0;
     }
     
-    perl_current_script_filename = filename;
-    
     PERL_SET_CONTEXT (perl_current_interpreter);
     perl_construct (perl_current_interpreter);
     temp_script.interpreter = (PerlInterpreter *) perl_current_interpreter;