Do something half-way sane (no SIGSEGV) when there are no dives

It just leaves ugly blank areas, but whatever.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-08-31 16:40:22 -07:00
parent 00d798854a
commit 968aa28155
2 changed files with 9 additions and 2 deletions

7
info.c
View file

@ -12,6 +12,13 @@ void update_dive_info(struct dive *dive)
struct tm *tm;
char buffer[80];
if (!dive) {
gtk_entry_set_text(GTK_ENTRY(datetime), "no dive");
gtk_entry_set_text(GTK_ENTRY(depth), "");
gtk_entry_set_text(GTK_ENTRY(duration), "");
return;
}
tm = gmtime(&dive->when);
snprintf(buffer, sizeof(buffer),
"%04d-%02d-%02d "

View file

@ -100,7 +100,7 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive, int samples, stru
static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
struct dive *dive = dive_table.dives[selected_dive];
struct dive *dive = current_dive;
cairo_t *cr;
int w,h;
@ -111,7 +111,7 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer
cairo_set_source_rgb(cr, 0, 0, 0);
cairo_paint(cr);
if (dive->samples)
if (dive && dive->samples)
plot(cr, w, h, dive, dive->samples, dive->sample);
cairo_destroy(cr);