summaryrefslogtreecommitdiff
path: root/navit/gui/gtk
diff options
context:
space:
mode:
authorhorwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-06-16 09:20:08 +0000
committerhorwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-06-16 09:20:08 +0000
commit3f4edca3f3c670b027c044ad08b4a0ef87cc673c (patch)
tree9e06fb60777b627bedc2366f976b72f77e3d3803 /navit/gui/gtk
parent9f02c80606cbe722fc419e018caf57319a0ded07 (diff)
downloadnavit-3f4edca3f3c670b027c044ad08b4a0ef87cc673c.tar.gz
Fix:Core:Fix coverity bug #4, Variable gui tracked as NULL was dereferenced.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2321 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/gui/gtk')
-rw-r--r--navit/gui/gtk/datawindow.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/navit/gui/gtk/datawindow.c b/navit/gui/gtk/datawindow.c
index 3e9920e05..75f43a80a 100644
--- a/navit/gui/gtk/datawindow.c
+++ b/navit/gui/gtk/datawindow.c
@@ -186,6 +186,8 @@ gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click,
{
struct datawindow_priv *win;
+ if (!gui)
+ return NULL;
*meth=gui_gtk_datawindow_meth;
win=g_new0(struct datawindow_priv, 1);
win->window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -201,8 +203,7 @@ gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click,
win->treeview=NULL;
win->click=click;
win->close=close;
- if (gui)
- gtk_window_set_transient_for(GTK_WINDOW((GtkWidget *)(win->window)), GTK_WINDOW(gui->win));
+ gtk_window_set_transient_for(GTK_WINDOW((GtkWidget *)(win->window)), GTK_WINDOW(gui->win));
g_signal_connect(G_OBJECT(win->window), "delete-event", G_CALLBACK(gui_gtk_datawindow_delete), win);
gtk_widget_show_all(win->window);