From 25c4ea7a6e73d4d4a0dcf61eff15ea8d055c1c46 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 21 Jul 2014 11:54:21 +0100 Subject: stop treeview redraw failing because of bad global state. --- desktop/tree.c | 4 +++- desktop/tree.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/desktop/tree.c b/desktop/tree.c index 15118c3d2..c29afa761 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -212,7 +212,9 @@ static bool treeview_test_redraw(struct tree *tree, int x, int y, switch (tree->flags) { case TREE_SSLCERT: - sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx); + if (ssl_current_session != NULL) { + sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx); + } return true; case TREE_COOKIES: cookie_manager_redraw(x, y, &clip, ctx); diff --git a/desktop/tree.h b/desktop/tree.h index a411437f0..c70f888dc 100644 --- a/desktop/tree.h +++ b/desktop/tree.h @@ -33,6 +33,10 @@ struct sslcert_session_data; struct tree; struct redraw_context; +/** Current ssl session data for treeview + * + * @fixme global certificate treeview state must go away, this is just wrong. + */ extern struct sslcert_session_data *ssl_current_session; extern const char *tree_hotlist_path; -- cgit v1.2.3