4 files changed, 7 insertions, 16 deletions
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp
index 2d5814c954..34b0e19d31 100644
--- a/scene/main/http_request.cpp
+++ b/scene/main/http_request.cpp
@@ -197,10 +197,7 @@ void HTTPRequest::cancel_request() {
 		thread.wait_to_finish();
 	}
 
-	if (file) {
-		memdelete(file);
-		file = nullptr;
-	}
+	file.unref();
 	client->close();
 	body.clear();
 	got_response = false;
@@ -365,7 +362,7 @@ bool HTTPRequest::_update_connection() {
 
 				if (!download_to_file.is_empty()) {
 					file = FileAccess::open(download_to_file, FileAccess::WRITE);
-					if (!file) {
+					if (file.is_null()) {
 						call_deferred(SNAME("_request_done"), RESULT_DOWNLOAD_FILE_CANT_OPEN, response_code, response_headers, PackedByteArray());
 						return true;
 					}
@@ -381,7 +378,7 @@ bool HTTPRequest::_update_connection() {
 
 			if (chunk.size()) {
 				downloaded.add(chunk.size());
-				if (file) {
+				if (file.is_valid()) {
 					const uint8_t *r = chunk.ptr();
 					file->store_buffer(r, chunk.size());
 					if (file->get_error() != OK) {
@@ -642,9 +639,3 @@ HTTPRequest::HTTPRequest() {
 	timer->connect("timeout", callable_mp(this, &HTTPRequest::_timeout));
 	add_child(timer);
 }
-
-HTTPRequest::~HTTPRequest() {
-	if (file) {
-		memdelete(file);
-	}
-}
diff --git a/scene/main/http_request.h b/scene/main/http_request.h
index 8b3441f7d7..49b4b1b30c 100644
--- a/scene/main/http_request.h
+++ b/scene/main/http_request.h
@@ -84,7 +84,7 @@ private:
 
 	String download_to_file;
 
-	FileAccess *file = nullptr;
+	Ref<FileAccess> file;
 
 	int body_len = -1;
 	SafeNumeric<int> downloaded;
@@ -158,7 +158,6 @@ public:
 	void set_https_proxy(const String &p_host, int p_port);
 
 	HTTPRequest();
-	~HTTPRequest();
 };
 
 VARIANT_ENUM_CAST(HTTPRequest::Result);
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index d005633bb5..151239c9e7 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -1262,7 +1262,7 @@ void SceneTree::add_idle_callback(IdleCallback p_callback) {
 
 void SceneTree::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
 	if (p_function == "change_scene") {
-		DirAccessRef dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+		Ref<DirAccess> dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 		List<String> directories;
 		directories.push_back(dir_access->get_current_dir());
 
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 2faa107fb4..9a7ed1a0ec 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -981,7 +981,7 @@ void Window::_window_input_text(const String &p_text) {
 }
 
 void Window::_window_drop_files(const Vector<String> &p_files) {
-	emit_signal(SNAME("files_dropped"), p_files, current_screen);
+	emit_signal(SNAME("files_dropped"), p_files);
 }
 
 Viewport *Window::get_parent_viewport() const {
@@ -1079,6 +1079,7 @@ void Window::popup_centered(const Size2i &p_minsize) {
 void Window::popup_centered_ratio(float p_ratio) {
 	ERR_FAIL_COND(!is_inside_tree());
 	ERR_FAIL_COND_MSG(window_id == DisplayServer::MAIN_WINDOW_ID, "Can't popup the main window.");
+	ERR_FAIL_COND_MSG(p_ratio <= 0.0 || p_ratio > 1.0, "Ratio must be between 0.0 and 1.0!");
 
 	Rect2 parent_rect;