From b5274724edd6842ff78cd505763ef0643c2f0dcb Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Thu, 7 Sep 2006 09:44:50 +0000
Subject: [PATCH] Fix dataload stupidities

svn path=/trunk/netsurf/; revision=2925
---
 riscos/gui.c    | 6 ++++--
 riscos/window.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/riscos/gui.c b/riscos/gui.c
index 019b290fa..bb2fe3e18 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -1369,10 +1369,12 @@ void ro_msg_dataload(wimp_message *message)
 
 	g = ro_gui_window_lookup(message->data.data_xfer.w);
 	if (g) {
-	  	while (g->bw->parent)
-	  		g = g->bw->parent->window;
 		if (ro_gui_window_dataload(g, message))
 			return;
+
+		/* Get top-level window for loading into */
+		while (g->bw->parent)
+			g = g->bw->parent->window;
 	}
 	else {
 		g = ro_gui_toolbar_lookup(message->data.data_xfer.w);
diff --git a/riscos/window.c b/riscos/window.c
index 44bd0d407..eeeac6dfd 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -2719,7 +2719,7 @@ bool ro_gui_window_dataload(struct gui_window *g, wimp_message *message)
 		return false;
 
 	if (!ro_gui_window_to_window_pos(g, message->data.data_xfer.pos.x,
-			message->data.data_xfer.pos.x, &pos))
+			message->data.data_xfer.pos.y, &pos))
 		return false;
 
 	content = bw->current_content;