mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-23 02:42:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to exit the main loop properly from the replicant view destructor. There are still some issues with multiple instances or on second instanciation though...

Browse Source 
svn path=/trunk/netsurf/; revision=11030
This commit is contained in:
François Revel 2010-12-12 01:36:40 +00:00
parent 6b5a0c838a
commit a5b5eedd50
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
beos/beos_scaffolding.cpp
View File

@ -151,7 +151,6 @@ struct replicant_thread_info {
};
static int open_windows = 0; /**< current number of open browsers */
static struct beos_scaffolding *current_model; /**< current window for model dialogue use */
static NSBaseView *replicant_view = NULL; /**< if not NULL, the replicant View we are running NetSurf for */
@ -343,6 +342,9 @@ NSBaseView::NSBaseView(BMessage *archive)
NSBaseView::~NSBaseView()
{
//warn_user ("~NSBaseView()", NULL);
BMessage *message = new BMessage(B_QUIT_REQUESTED);
nsbeos_pipe_message_top(message, NULL, fScaffolding);
while (acquire_sem(replicant_done_sem) == EINTR);
}
@ -517,7 +519,6 @@ NSBaseView::Instantiate(BMessage *archive)
}
resume_thread(nsMainThread);
while (acquire_sem(replicant_done_sem) == EINTR);
delete_sem(replicant_done_sem);
return view;
}
@ -612,6 +613,8 @@ int32 nsbeos_replicant_main_thread(void *_arg)
//netsurf_main_loop();
//netsurf_exit();
delete info;
//release
delete_sem(replicant_done_sem);
return ret;
}
@ -625,8 +628,10 @@ static void nsbeos_window_destroy_event(NSBrowserWindow *window, nsbeos_scaffold
if (--open_windows == 0)
netsurf_quit = true;
window->Lock();
window->Quit();
if (window) {
window->Lock();
window->Quit();
}
if (!g->being_destroyed) {
g->being_destroyed = 1;