Merge branch 'event-bug-test' of git://github.com/JanKanis/fish-shell into JanKanis-event-bug-test

1 files changed, 5 insertions, 2 deletions

diff --git a/parser.cpp b/parser.cpp
index fa8726f1..a2caebef 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -2077,6 +2077,7 @@ int parser_t::parse_job(process_t *p,
 
                     int tmp;
                     const wchar_t *cmd = args.at(0).completion.c_str();
+                    wcstring_list_t event_args;
 
                     /*
                      We couldn't find the specified command.
@@ -2157,7 +2158,9 @@ int parser_t::parse_job(process_t *p,
                     current_tokenizer_pos=tmp;
 
                     job_set_flag(j, JOB_SKIP, 1);
-                    event_fire_generic(L"fish_command_not_found", (wchar_t *)(args.at(0).completion.c_str()));
+
+                    event_args.push_back(args.at(0).completion);
+                    event_fire_generic(L"fish_command_not_found", &event_args);
                     proc_set_last_status(err==ENOENT?STATUS_UNKNOWN_COMMAND:STATUS_NOT_EXECUTABLE);
                 }
             }
@@ -3795,7 +3798,7 @@ if_block_t::if_block_t() :
 {
 }
 
-event_block_t::event_block_t(const event_t *evt) :
+event_block_t::event_block_t(const event_t &evt) :
     block_t(EVENT),
     event(evt)
 {