diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2005-06-07 21:58:17 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2005-06-07 21:58:17 +0000 |
| commit | c0fce75798460fd00ae9f84bf4c9613558ee9324 (patch) | |
| tree | bbb2ee0e89304b10afb60ea83f66a729750204dd /desktop | |
| parent | 0bcfdbeb50b2435b848ea1fd50ccc79ba64fd129 (diff) | |
| download | netsurf-c0fce75798460fd00ae9f84bf4c9613558ee9324.tar.gz netsurf-c0fce75798460fd00ae9f84bf4c9613558ee9324.tar.bz2 | |
[project @ 2005-06-07 21:58:17 by jmb]
Fix stupid assertions.
svn path=/import/netsurf/; revision=1745
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/browser.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 13ca3cab9..e65fa38c6 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -489,10 +489,19 @@ void browser_window_update(struct browser_window *bw, if (bw->current_content->title != NULL) { err = utf8_to_enc(bw->current_content->title, local_encoding_name(), 0, &title_local_enc); - /* this should never fail */ - assert(err == UTF8_CONVERT_OK); - gui_window_set_title(bw->window, title_local_enc); - free(title_local_enc); + if (err != UTF8_CONVERT_OK) { + /* A bad encoding should never happen, + * so assert this */ + assert(err != UTF8_CONVERT_BADENC); + LOG(("utf8_to_enc failed")); + /* use utf-8 encoded title instead */ + gui_window_set_title(bw->window, + bw->current_content->title); + } + else { + gui_window_set_title(bw->window, title_local_enc); + free(title_local_enc); + } } else gui_window_set_title(bw->window, bw->current_content->url); |