Merge branch 'dgud/wx/unload-driver/OTP-9080' into dev

* dgud/wx/unload-driver/OTP-9080:
  Fix bad string copy during initialization
  Fix start args
  Fixed coredump when graphics could not be initiated

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 79d1a29519..2a2ec1e40b 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -117,6 +117,9 @@ int start_native_gui(wxe_data *sd)
 
 void stop_native_gui(wxe_data *sd)
 {
+  if(wxe_status == WXE_INITIATED) {
+    meta_command(WXE_SHUTDOWN, sd);
+  }
   erl_drv_thread_join(wxe_thread, NULL);
   erl_drv_mutex_destroy(wxe_status_m);
   erl_drv_cond_destroy(wxe_status_c);
@@ -182,8 +185,8 @@ void *wxe_main_loop(void *vpdl)
 {
   int result; 
   int  argc = 1;
-  char * temp = (char *) "Erlang\0";
-  char ** argv = &temp;
+  char * temp = (char *) "Erlang";
+  char * argv[] = {temp,NULL};
   ErlDrvPDL pdl = (ErlDrvPDL) vpdl;
   
   driver_pdl_inc_refc(pdl);