p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 10 Wiki Activity

degesch: fix libedit initialization

This commit is contained in:
Přemysl Eric Janouch 2015-05-05 22:35:51 +02:00
parent e542aa5acc
commit 99526126e4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
degesch.c
View File

@ -453,6 +453,8 @@ input_make_prompt (EditLine *editline)
{ {
struct input *self; struct input *self;
el_get (editline, EL_CLIENTDATA, &self); el_get (editline, EL_CLIENTDATA, &self);
if (!self->prompt)
return "";
return self->prompt; return self->prompt;
} }
@ -565,13 +567,15 @@ input_destroy_buffer (struct input *self, struct input_buffer *buffer)
static void static void
input_save (struct input *self) input_save (struct input *self)
{ {
input_save_buffer (self, self->current); if (self->current)
input_save_buffer (self, self->current);
} }
static void static void
input_restore (struct input *self) input_restore (struct input *self)
{ {
input_restore_buffer (self, self->current); if (self->current)
input_restore_buffer (self, self->current);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -2789,7 +2793,7 @@ static void
make_prompt (struct app_context *ctx, struct str *output) make_prompt (struct app_context *ctx, struct str *output)
{ {
struct buffer *buffer = ctx->current_buffer; struct buffer *buffer = ctx->current_buffer;
if (!soft_assert (buffer)) if (!buffer)
return; return;
str_append_c (output, '['); str_append_c (output, '[');
@ -5492,10 +5496,9 @@ main (int argc, char *argv[])
init_colors (&ctx); init_colors (&ctx);
init_poller_events (&ctx); init_poller_events (&ctx);
init_buffers (&ctx); init_buffers (&ctx);
buffer_activate (&ctx, ctx.server.buffer);
refresh_prompt (&ctx);
input_start (&ctx.input, argv[0]); input_start (&ctx.input, argv[0]);
buffer_activate (&ctx, ctx.server.buffer);
// Connect to the server ASAP // Connect to the server ASAP
poller_timer_set (&ctx.server.reconnect_tmr, 0); poller_timer_set (&ctx.server.reconnect_tmr, 0);