8 files changed, 25 insertions, 14 deletions
diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp
index d5940fb102..bb238ede0c 100644
--- a/platform/javascript/audio_server_javascript.cpp
+++ b/platform/javascript/audio_server_javascript.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "audio_server_javascript.h"
-
+#if 0
 #include "emscripten.h"
 
 AudioMixer *AudioServerJavascript::get_mixer() {
@@ -847,3 +847,4 @@ AudioServerJavascript::AudioServerJavascript() {
 	stream_volume_scale=1.0;
 
 }
+#endif
diff --git a/platform/javascript/audio_server_javascript.h b/platform/javascript/audio_server_javascript.h
index f8c8774e4c..2f48e7e79e 100644
--- a/platform/javascript/audio_server_javascript.h
+++ b/platform/javascript/audio_server_javascript.h
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #ifndef AUDIO_SERVER_JAVASCRIPT_H
 #define AUDIO_SERVER_JAVASCRIPT_H
-
+#if 0
 #include "servers/audio_server.h"
 
 class AudioServerJavascript  : public AudioServer  {
@@ -223,3 +223,4 @@ public:
 };
 
 #endif // AUDIO_SERVER_JAVASCRIPT_H
+#endif
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index a8bdb0a4f9..799b550899 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -86,7 +86,6 @@ def configure(env):
     env.Append(CPPFLAGS=["-fno-exceptions", '-DNO_SAFE_CAST', '-fno-rtti'])
     env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL', '-DMPC_FIXED_POINT', '-DTYPED_METHOD_BIND', '-DNO_THREADS'])
     env.Append(CPPFLAGS=['-DGLES3_ENABLED'])
-    env.Append(CPPFLAGS=['-DGLES_NO_CLIENT_ARRAYS'])
 
     if env['wasm'] == 'yes':
         env.Append(LINKFLAGS=['-s', 'BINARYEN=1'])
diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp
index e096e96a36..076f93f0df 100644
--- a/platform/javascript/javascript_main.cpp
+++ b/platform/javascript/javascript_main.cpp
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) {
 
 
 	/* Initialize the window */
-	printf("let it go!\n");
+	printf("let it go dude!\n");
 	glutInit(&argc, argv);
 	os = new OS_JavaScript(_gfx_init,NULL,NULL);
 #if 0
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp
index 931f60ea82..201008b1db 100644
--- a/platform/javascript/os_javascript.cpp
+++ b/platform/javascript/os_javascript.cpp
@@ -282,6 +282,8 @@ void OS_JavaScript::initialize(const VideoMode& p_desired,int p_video_driver,int
 	javascript_eval = memnew(JavaScript);
 	GlobalConfig::get_singleton()->add_singleton(GlobalConfig::Singleton("JavaScript", javascript_eval));
 #endif
+
+	visual_server->init();
 }
 
 void OS_JavaScript::set_main_loop( MainLoop * p_main_loop ) {
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 1afbfd5230..0ef964522b 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1255,6 +1255,10 @@ void OS_Windows::finalize() {
 
 	main_loop=NULL;
 
+	for (int i = 0; i < get_audio_driver_count(); i++) {
+		AudioDriverManager::get_driver(i)->finish();
+	}
+
 	memdelete(joypad);
 	memdelete(input);
 
@@ -1282,13 +1286,8 @@ void OS_Windows::finalize() {
 	memdelete(physics_2d_server);
 
 	monitor_info.clear();
-
-	for (int i = 0; i < get_audio_driver_count(); i++)
-	{
-		AudioDriverManager::get_driver(i)->finish();
-	}
-
 }
+
 void OS_Windows::finalize_core() {
 
 	memdelete(process_map);
@@ -1969,10 +1968,10 @@ Error OS_Windows::execute(const String& p_path, const List<String>& p_arguments,
 
 		String argss;
 		argss="\"\""+p_path+"\"";
+		
+		for (const List<String>::Element* E=p_arguments.front(); E; E=E->next()) {
 
-		for(int i=0;i<p_arguments.size();i++) {
-
-			argss+=String(" \"")+p_arguments[i]+"\"";
+			argss+=String(" \"")+E->get()+"\"";
 		}
 
 		//print_line("ARGS: "+argss);
diff --git a/platform/x11/godot_x11.cpp b/platform/x11/godot_x11.cpp
index f85ba17020..b727ecbd17 100644
--- a/platform/x11/godot_x11.cpp
+++ b/platform/x11/godot_x11.cpp
@@ -26,6 +26,9 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
+#include <unistd.h>
+#include <limits.h>
+
 #include "main/main.h"
 #include "os_x11.h"
 
@@ -33,6 +36,9 @@ int main(int argc, char* argv[]) {
 
 	OS_X11 os;
 
+	char *cwd = (char*)malloc(PATH_MAX);
+	getcwd(cwd, PATH_MAX);
+
 	Error err  = Main::setup(argv[0],argc-1,&argv[1]);
 	if (err!=OK)
 		return 255;
@@ -41,5 +47,8 @@ int main(int argc, char* argv[]) {
 		os.run(); // it is actually the OS that decides how to run
 	Main::cleanup();
 
+	chdir(cwd);
+	free(cwd);
+
 	return os.get_exit_code();
 }
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 27df280927..a4ed08f330 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -1241,7 +1241,7 @@ static Property read_property(Display* p_display, Window p_window, Atom p_proper
 
 	}while(bytes_after != 0);
 
-	Property p = {ret, actual_format, nitems, actual_type};
+	Property p = {ret, actual_format, (int)nitems, actual_type};
 
 	return p;
 }