aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-08-19 10:10:20 +0200
committerDan Gudmundsson <[email protected]>2016-08-19 10:10:20 +0200
commit08cece25cf519d35b97b5cf38619a51c53416129 (patch)
tree220c699a2c1b5f7a01cb6840909ab366bb78d028
parent69c270561a81d1fbdc2b15b5160c4d590ce2ff3d (diff)
parentb55872ff87a46d7f8eb3d8142731b196df20e500 (diff)
downloadotp-08cece25cf519d35b97b5cf38619a51c53416129.tar.gz
otp-08cece25cf519d35b97b5cf38619a51c53416129.tar.bz2
otp-08cece25cf519d35b97b5cf38619a51c53416129.zip
Merge branch 'maint'
* maint: Request a larger stacksize for wx thread
-rw-r--r--lib/wx/c_src/wxe_main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/wx/c_src/wxe_main.cpp b/lib/wx/c_src/wxe_main.cpp
index 6fcde42eb5..c7565e33bd 100644
--- a/lib/wx/c_src/wxe_main.cpp
+++ b/lib/wx/c_src/wxe_main.cpp
@@ -67,6 +67,7 @@ int load_native_gui()
int start_native_gui(wxe_data *sd)
{
int res;
+ ErlDrvThreadOpts *opts = NULL;
wxe_status_m = erl_drv_mutex_create((char *) "wxe_status_m");
wxe_status_c = erl_drv_cond_create((char *)"wxe_status_c");
@@ -78,8 +79,11 @@ int start_native_gui(wxe_data *sd)
res = erl_drv_steal_main_thread((char *)"wxwidgets",
&wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
#else
+ opts = erl_drv_thread_opts_create((char *)"wx thread");
+ opts->suggested_stack_size = 8192;
res = erl_drv_thread_create((char *)"wxwidgets",
- &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
+ &wxe_thread,wxe_main_loop,(void *) sd->pdl,opts);
+ erl_drv_thread_opts_destroy(opts);
#endif
if(res == 0) {
erl_drv_mutex_lock(wxe_status_m);