summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2006-04-29 19:59:26 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2006-04-29 19:59:26 +0000
commit56f08aca958213f5a704abeecc31ec40ba9fedf7 (patch)
tree4bfe75e0c057a906e231d52c25b86b78c508d0ed
parent001dbd4a06913477949c107693a0511ff3a16326 (diff)
downloadnetsurf-56f08aca958213f5a704abeecc31ec40ba9fedf7.tar.gz
netsurf-56f08aca958213f5a704abeecc31ec40ba9fedf7.tar.bz2
Fix crash when no Choices file is present
svn path=/trunk/netsurf/; revision=2562
-rw-r--r--riscos/configure/con_connect.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c
index 0f0928ca9..97356aa6c 100644
--- a/riscos/configure/con_connect.c
+++ b/riscos/configure/con_connect.c
@@ -60,13 +60,16 @@ bool ro_gui_options_connection_initialise(wimp_w w) {
proxy_type_menu->entries[proxy_type].
data.indirected_text.text);
ro_gui_set_icon_string(w, CONNECTION_PROXY_HOST,
- option_http_proxy_host);
+ option_http_proxy_host ?
+ option_http_proxy_host : "");
ro_gui_set_icon_integer(w, CONNECTION_PROXY_PORT,
option_http_proxy_port);
ro_gui_set_icon_string(w, CONNECTION_PROXY_USERNAME,
- option_http_proxy_auth_user);
+ option_http_proxy_auth_user ?
+ option_http_proxy_auth_user : "");
ro_gui_set_icon_string(w, CONNECTION_PROXY_PASSWORD,
- option_http_proxy_auth_pass);
+ option_http_proxy_auth_pass ?
+ option_http_proxy_auth_pass : "");
ro_gui_set_icon_integer(w, CONNECTION_MAX_FETCH_FIELD,
option_max_fetchers);
ro_gui_set_icon_integer(w, CONNECTION_HOST_FETCH_FIELD,