Browse Source

fixed some operations not apply DataFiles on CDB before save

Nicolas Cannasse 5 years ago
parent
commit
fcdf62f83c
2 changed files with 15 additions and 13 deletions
  1. 14 12
      hide/Ide.hx
  2. 1 1
      hide/comp/cdb/Editor.hx

+ 14 - 12
hide/Ide.hx

@@ -688,19 +688,21 @@ class Ide {
 	}
 
 	public function saveDatabase() {
-		if( databaseDiff != null ) {
-			fileWatcher.ignoreNextChange(databaseDiff);
-			sys.io.File.saveContent(getPath(databaseDiff), toJSON(new cdb.DiffFile().make(originDataBase,database)));
-		} else {
-			if( !sys.FileSystem.exists(getPath(databaseFile)) && fileExists(databaseFile) ) {
-				// was loaded from pak, cancel changes
-				loadDatabase();
-				hide.comp.cdb.Editor.refreshAll();
-				return;
+		hide.comp.cdb.DataFiles.save(function() {
+			if( databaseDiff != null ) {
+				fileWatcher.ignoreNextChange(databaseDiff);
+				sys.io.File.saveContent(getPath(databaseDiff), toJSON(new cdb.DiffFile().make(originDataBase,database)));
+			} else {
+				if( !sys.FileSystem.exists(getPath(databaseFile)) && fileExists(databaseFile) ) {
+					// was loaded from pak, cancel changes
+					loadDatabase();
+					hide.comp.cdb.Editor.refreshAll();
+					return;
+				}
+				fileWatcher.ignoreNextChange(databaseFile);
+				sys.io.File.saveContent(getPath(databaseFile), database.save());
 			}
-			fileWatcher.ignoreNextChange(databaseFile);
-			sys.io.File.saveContent(getPath(databaseFile), database.save());
-		}
+		});
 	}
 
 	public function createDBSheet( ?index : Int ) {

+ 1 - 1
hide/comp/cdb/Editor.hx

@@ -439,7 +439,7 @@ class Editor extends Component {
 	}
 
 	function save() {
-		DataFiles.save(function() api.save());
+		api.save();
 	}
 
 	public static function refreshAll( eraseUndo = false ) {