summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2012-12-10 11:02:33 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-12-10 11:02:33 -0800
commit0ae16899defc383eaedacf20f5ba03719d1e9322 (patch)
tree8dbac988f51d2842d71c8d66adfbcb5fde140624
parent7cf1960336011b8ef702c3bc2458b27db0fc1a4e (diff)
downloadsubsurface-0ae16899defc383eaedacf20f5ba03719d1e9322.tar.gz
Don't draw tooltips if no profile is displayed
This fixes ticket 33 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--gtk-gui.c4
-rw-r--r--profile.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/gtk-gui.c b/gtk-gui.c
index 842a28740..a2681de0f 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -1302,6 +1302,10 @@ static gboolean profile_tooltip (GtkWidget *widget, gint x, gint y,
if (tx < 0 || ty < 0)
return FALSE;
+ /* don't draw a tooltip if nothing is there */
+ if (gc->pi.nr == 0)
+ return FALSE;
+
width = drawing_area->width - 2*drawing_area->x;
height = drawing_area->height - 2*drawing_area->y;
if (width <= 0 || height <= 0)
diff --git a/profile.c b/profile.c
index 4b02f9bc1..f8b4bd168 100644
--- a/profile.c
+++ b/profile.c
@@ -2120,7 +2120,7 @@ void get_plot_details(struct graphics_context *gc, int time, char *buf, size_t b
{
struct plot_info *pi = &gc->pi;
int pressure = 0, temp = 0;
- struct plot_data *entry;
+ struct plot_data *entry = NULL;
int i;
for (i = 0; i < pi->nr; i++) {
@@ -2132,5 +2132,6 @@ void get_plot_details(struct graphics_context *gc, int time, char *buf, size_t b
if (entry->sec >= time)
break;
}
- plot_string(entry, buf, bufsize, entry->depth, pressure, temp, pi->has_ndl);
+ if (entry)
+ plot_string(entry, buf, bufsize, entry->depth, pressure, temp, pi->has_ndl);
}