summaryrefslogtreecommitdiff
path: root/beos/beos_gui.cpp
diff options
context:
space:
mode:
authorFran├žois Revel <mmu_man@netsurf-browser.org>2008-10-16 20:52:00 +0000
committerFran├žois Revel <mmu_man@netsurf-browser.org>2008-10-16 20:52:00 +0000
commit3f0ded25ba5388da0ff546a2f44f3c1bbb817dae (patch)
treeef759e0ae2462683d1560c8a3a5198e25d6805c3 /beos/beos_gui.cpp
parentf33fd2c604a2e1d332211db3cc5147b23920c685 (diff)
downloadnetsurf-3f0ded25ba5388da0ff546a2f44f3c1bbb817dae.tar.gz
netsurf-3f0ded25ba5388da0ff546a2f44f3c1bbb817dae.tar.bz2
Call netsurf_init() from the thread creating the replicant, then the main loop from the thread we created. This avoids a deadlock with the replicant in BeHappy in Haiku. (I should probably make BTranslatorRoster not lock be_app anyway though).
svn path=/trunk/netsurf/; revision=5588
Diffstat (limited to 'beos/beos_gui.cpp')
-rw-r--r--beos/beos_gui.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp
index 2e8d2ca0f..83f0d88b5 100644
--- a/beos/beos_gui.cpp
+++ b/beos/beos_gui.cpp
@@ -308,8 +308,10 @@ image_id nsbeos_find_app_path(char *path)
if (((char *)&nsbeos_find_app_path >= (char *)info.text)
&& ((char *)&nsbeos_find_app_path < (char *)info.text + info.text_size)) {
//fprintf(stderr, "match\n");
- if (path)
- strlcpy(path, info.name, B_PATH_NAME_LENGTH);
+ if (path) {
+ memset(path, 0, B_PATH_NAME_LENGTH);
+ strncpy(path, info.name, B_PATH_NAME_LENGTH-1);
+ }
return info.id;
}
}