Parcourir la source

[cdb] Fix cdbTable null access when using ObjEditor

Yuxiao Mao il y a 2 semaines
Parent
commit
21998f21ec
1 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 4 4
      hide/comp/cdb/Editor.hx

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

@@ -1025,7 +1025,7 @@ class Editor extends Component {
 				}
 				makeParent(tables[i]);
 			}],
-			sheetOrder : cdbTable.sheetsOrder.copy(),
+			sheetOrder : cdbTable?.sheetsOrder.copy(),
 		};
 	}
 
@@ -1081,7 +1081,7 @@ class Editor extends Component {
 		var state = undoState[0];
 		var newSheet = getCurrentSheet();
 		var newSaparatorsState = separatorsState;
-		var newSheetsOrder = cdbTable.sheetsOrder.copy();
+		var newSheetsOrder = cdbTable?.sheetsOrder.copy();
 		currentValue = newValue;
 		save();
 		undo.change(Custom(function(undo) {
@@ -1091,13 +1091,13 @@ class Editor extends Component {
 				currentValue = state.data;
 				currentSheet = state.sheet;
 				separatorsState = state.separatorsState;
-				cdbTable.sheetsOrder = state.sheetOrder;
+				if( cdbTable != null ) cdbTable.sheetsOrder = state.sheetOrder;
 			} else {
 				undoState.unshift(state);
 				currentValue = newValue;
 				currentSheet = newSheet;
 				separatorsState = newSaparatorsState;
-				cdbTable.sheetsOrder = newSheetsOrder;
+				if( cdbTable != null ) cdbTable.sheetsOrder = newSheetsOrder;
 			}
 			api.load(currentValue);
 			DataFiles.save(true); // save reloaded data