summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-10-29 00:37:35 +0000
committerVincent Sanders <vince@kyllikki.org>2014-10-29 00:37:35 +0000
commit847e1111bce323ba5277c4babf70c5441233bcd7 (patch)
tree51532b25c109fccbd33d1c3311f11b3d900ec1d2
parentd900feefba603b07655b0e95d15753706e59638e (diff)
downloadnetsurf-847e1111bce323ba5277c4babf70c5441233bcd7.tar.gz
netsurf-847e1111bce323ba5277c4babf70c5441233bcd7.tar.bz2
fix beos url setting function to return error code
-rw-r--r--beos/scaffolding.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index 48cf72ec3..cdd809f0e 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -2166,18 +2166,21 @@ void gui_window_set_status(struct gui_window *_g, const char *text)
g->top_view->UnlockLooper();
}
-nserror gui_window_set_url(struct gui_window *_g, const char *url)
+nserror gui_window_set_url(struct gui_window *gw, const char *url)
{
- struct beos_scaffolding *g = nsbeos_get_scaffold(_g);
- if (g->top_level != _g) return;
- assert(g->status_bar);
+ struct beos_scaffolding *g;
- if (!g->top_view->LockLooper())
- return;
+ g = nsbeos_get_scaffold(gw);
+ if (g->top_level != gw)
+ return NSERROR_OK;
+
+ assert(g->status_bar);
- g->url_bar->SetText(url);
+ if (g->top_view->LockLooper()) {
+ g->url_bar->SetText(url);
- g->top_view->UnlockLooper();
+ g->top_view->UnlockLooper();
+ }
return NSERROR_OK;
}