summaryrefslogtreecommitdiff
path: root/riscos/treeview.c
diff options
context:
space:
mode:
authorAdrian Lees <adrian@aemulor.com>2005-03-29 13:32:11 +0000
committerAdrian Lees <adrian@aemulor.com>2005-03-29 13:32:11 +0000
commite7e34b78c3c843cac7343aeb9a34090d4003d32f (patch)
tree3adef8780efb813aebc0c0e6ed35f06a07811a71 /riscos/treeview.c
parent29d44c739e9f90dbaeb2257f914ebd44949622b6 (diff)
downloadnetsurf-e7e34b78c3c843cac7343aeb9a34090d4003d32f.tar.gz
netsurf-e7e34b78c3c843cac7343aeb9a34090d4003d32f.tar.bz2
[project @ 2005-03-29 13:32:11 by adrianl]
Fix read from NULL ptr when clicking on hotlist background svn path=/import/netsurf/; revision=1586
Diffstat (limited to 'riscos/treeview.c')
-rw-r--r--riscos/treeview.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/riscos/treeview.c b/riscos/treeview.c
index 5b0488acb..e570819d0 100644
--- a/riscos/treeview.c
+++ b/riscos/treeview.c
@@ -610,7 +610,6 @@ bool ro_gui_tree_click(wimp_pointer *pointer, struct tree *tree) {
x = pointer->pos.x - ro_gui_tree_origin_x;
y = ro_gui_tree_origin_y - pointer->pos.y;
element = tree_get_node_element_at(tree->root->child, x, y, &furniture);
- node = element->parent;
/* stop editing for anything but a drag */
@@ -623,6 +622,8 @@ bool ro_gui_tree_click(wimp_pointer *pointer, struct tree *tree) {
if ((!element) || (!tree->root->child) ||
(tree_has_selection(tree->root->child)))
return true;
+
+ node = element->parent;
tree->temp_selection = node;
node->selected = true;
tree_handle_node_element_changed(tree, &node->data);
@@ -674,6 +675,8 @@ bool ro_gui_tree_click(wimp_pointer *pointer, struct tree *tree) {
return true;
}
+ node = element->parent;
+
/* click on furniture or double click on folder toggles node expansion */
if (((furniture) && ((pointer->buttons == wimp_CLICK_SELECT << 8) ||
(pointer->buttons == wimp_CLICK_ADJUST << 8) ||