From fc22fe935c828a7373c1f534d2939a127c2cbaea Mon Sep 17 00:00:00 2001 From: Tom Feist Date: Mon, 13 Dec 2010 05:41:34 +0000 Subject: history-search/rl_history_search: fix to make sure init() is called after attempting to load uberprompt (or not) appropriately. --- history-search/rl_history_search.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'history-search/rl_history_search.pl') diff --git a/history-search/rl_history_search.pl b/history-search/rl_history_search.pl index fcdde8b..ca45fe5 100644 --- a/history-search/rl_history_search.pl +++ b/history-search/rl_history_search.pl @@ -90,22 +90,29 @@ sub script_is_loaded { return $retval; } -unless (script_is_loaded('uberprompt')) { +if (not script_is_loaded('uberprompt')) { + print "This script requires 'uberprompt.pl' in order to work. " . "Attempting to load it now..."; - Irssi::signal_add('script error', \&load_uberprompt_failed); + + Irssi::signal_add('script error', 'load_uberprompt_failed'); Irssi::command("script load uberprompt.pl"); + unless(script_is_loaded('uberprompt')) { load_uberprompt_failed("File does not exist"); } history_init(); +} else { + history_init(); } sub load_uberprompt_failed { - Irssi::signal_remove('script error', \&load_prompt_failed); + Irssi::signal_remove('script error', 'load_prompt_failed'); + print "Script could not be loaded. Script cannot continue. " . "Check you have uberprompt.pl installed in your path and " . "try again."; + die "Script Load Failed: " . join(" ", @_); } -- cgit v1.2.3