5 files changed, 34 insertions, 6 deletions
diff --git a/platform/flash/dir_access_flash.cpp b/platform/flash/dir_access_flash.cpp
index 443242fd99..ce9eed2c59 100644
--- a/platform/flash/dir_access_flash.cpp
+++ b/platform/flash/dir_access_flash.cpp
@@ -183,12 +183,12 @@ size_t DirAccessFlash::get_space_left() {
 
 Error DirAccessFlash::rename(String p_from, String p_to) {
 
-	return FAILED;
+	ERR_FAIL_V(ERR_UNAVAILABLE);
 };
 
 Error DirAccessFlash::remove(String p_name) {
 
-	return FAILED;
+	ERR_FAIL_V(ERR_UNAVAILABLE);
 };
 
 extern char* psp_drive;
diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp
index e66110b655..632ef2b6b2 100644
--- a/platform/javascript/javascript_main.cpp
+++ b/platform/javascript/javascript_main.cpp
@@ -74,6 +74,15 @@ static void _glut_skey(bool pressed,int key) {
 		case GLUT_KEY_INSERT: ev.key.scancode=KEY_INSERT; break;
 	}
 
+	if (pressed) {
+		if (os->skey_pressed[key])
+			ev.key.echo = true;
+		else
+			os->skey_pressed[key] = true;
+	}
+	else {
+		os->skey_pressed[key] = false;
+	}
 
 	uint32_t m = glutGetModifiers();
 	ev.key.mod.alt=(m&GLUT_ACTIVE_ALT)!=0;
@@ -107,6 +116,16 @@ static void _glut_key(bool pressed,unsigned char key) {
 		default: {
 			ev.key.unicode=key;
 		}
+
+		if (pressed) {
+			if (os->key_pressed[key])
+				ev.key.echo = true;
+			else
+				os->key_pressed[key] = true;
+		}
+		else {
+			os->key_pressed[key] = false;
+		}
 	}
 
 
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp
index 562733ab89..413d88ee23 100644
--- a/platform/javascript/os_javascript.cpp
+++ b/platform/javascript/os_javascript.cpp
@@ -693,7 +693,11 @@ OS_JavaScript::OS_JavaScript(GFXInitFunc p_gfx_init_func,void*p_gfx_init_ud, Ope
 
 	time_to_save_sync=-1;
 
-
+	for (int i = 0; i < 256; i++) {
+		key_pressed[i] = false;
+		if (i < 121)
+			skey_pressed[i] = false;
+	}
 }
 
 OS_JavaScript::~OS_JavaScript() {
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h
index ec3a6cf911..4a8265b9d9 100644
--- a/platform/javascript/os_javascript.h
+++ b/platform/javascript/os_javascript.h
@@ -56,10 +56,12 @@ public:
 		Point2 pos;
 	};
 
+	bool skey_pressed[121];
+	bool key_pressed[256];
+
 private:
 
 	Vector<TouchPos> touch;
-
 	Point2 last_mouse;
 	unsigned int last_id;
 	GFXInitFunc gfx_init_func;
diff --git a/platform/osx/dir_access_osx.mm b/platform/osx/dir_access_osx.mm
index e345bea60a..29f8fda663 100644
--- a/platform/osx/dir_access_osx.mm
+++ b/platform/osx/dir_access_osx.mm
@@ -297,8 +297,11 @@ Error DirAccessOSX::rename(String p_path,String p_new_path) {
 }
 Error DirAccessOSX::remove(String p_path)  {
 
-	p_path=fix_path(p_path);
-	
+	if (p_path.is_rel_path())
+		p_path=get_current_dir().plus_file(p_path);
+	else
+		p_path=fix_path(p_path);
+
 	struct stat flags;
 	if ((stat(p_path.utf8().get_data(),&flags)!=0))
 		return FAILED;