From cff3f9f6b2f06f0b39775d9957a791e2b975e412 Mon Sep 17 00:00:00 2001
From: Manolis Papadeas <35376950+OverloadedOrama@users.noreply.github.com>
Date: Thu, 29 Oct 2020 22:35:20 +0200
Subject: [PATCH] Fixed issue where imported projects were not remembering the
 directory_path and file_name when switching tabs.

---
 CHANGELOG.md             | 2 +-
 src/Autoload/OpenSave.gd | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb37143fa..e0d20f0ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ PinyaColada, Rémi Verschelde (akien-mga), dasimonde
 - Made .pxo saving safer. In case of a crash while parsing JSON data, the old .pxo file, if it exists, will no longer be overwritten and corrupted.
 - Fixed issue where the user could grab and could not let go of the focus of guides even when they were invisible.
 - Fixed issues where fully transparent color could not be picked. One of these cases was [#364](https://github.com/Orama-Interactive/Pixelorama/issues/364).
-- Fixed "Export" option in the File menu not working properly when switching between projects, and not remembering the directory path and file name, if the project is an imported image and the tabs were switched.
+- Fixed "Export" option in the File menu not working properly and not remembering the directory path and file name when switching between projects (tabs).
 - Fixed Chinese and Korean characters not displaying properly in the Splash dialog and the About dialog.
 - Fixed crash when importing an incorrectly formatted GIMP Color Palette file. ([#363](https://github.com/Orama-Interactive/Pixelorama/issues/363))
 <br><br>
diff --git a/src/Autoload/OpenSave.gd b/src/Autoload/OpenSave.gd
index 3742cef94..0992d6ef1 100644
--- a/src/Autoload/OpenSave.gd
+++ b/src/Autoload/OpenSave.gd
@@ -116,6 +116,8 @@ func open_pxo_file(path : String, untitled_backup : bool = false) -> void:
 		Global.config_cache.save("user://cache.ini")
 		Export.file_name = path.get_file().trim_suffix(".pxo")
 		Export.directory_path = path.get_base_dir()
+		new_project.directory_path = Export.directory_path
+		new_project.file_name = Export.file_name
 		Export.was_exported = false
 		Global.file_menu.get_popup().set_item_text(4, tr("Save") + " %s" % path.get_file())
 		Global.file_menu.get_popup().set_item_text(6, tr("Export"))