summaryrefslogtreecommitdiff
path: root/amiga
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2013-09-15 00:05:52 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2013-09-15 00:05:52 +0100
commitfda18c49779f8abcd83eb902e1064147b1c397fc (patch)
tree2750c937c244f1ba4fadb2da0ddaecb099e92663 /amiga
parent04a118c4153a4c727c5843162f147311054ebf5a (diff)
downloadnetsurf-fda18c49779f8abcd83eb902e1064147b1c397fc.tar.gz
netsurf-fda18c49779f8abcd83eb902e1064147b1c397fc.tar.bz2
less over-zealous code removal
Diffstat (limited to 'amiga')
-rw-r--r--amiga/tree.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/amiga/tree.c b/amiga/tree.c
index a017f0fe5..80d05a68f 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 - 2012 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ * Copyright 2008 - 2013 Chris Young <chris@unsatisfactorysoftware.co.uk>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -276,6 +276,10 @@ void ami_tree_drag_icon_show(struct treeview_window *twin)
if((twin->type == AMI_TREE_COOKIES) ||
(twin->type == AMI_TREE_SSLCERT)) return; /* No permissable drag operations */
+ if((tree_drag_status(twin->tree) == TREE_SELECT_DRAG) ||
+ (tree_drag_status(twin->tree) == TREE_TEXTAREA_DRAG))
+ return;
+
if((twin->type == AMI_TREE_HOTLIST) && (hotlist_has_selection())) {
hotlist_get_selection(&url, &title);
} else if((twin->type == AMI_TREE_HISTORY) && (global_history_has_selection())) {