Changeset 162

Timestamp:

Jul 17, 2018, 11:50:38 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Do not close existing project before open dialog user confirmation on Open project action.

File:

• branches/generator/Forms/UFormMain.pas (modified) (2 diffs)

branches/generator/Forms/UFormMain.pas

@@ -224 +224 @@
 procedure TFormMain.ProjectOpen(FileName: string);
 begin
-  if Assigned(Core.Grammer) then FreeAndNil(Core.Grammer);
-  LastOpenedList1.AddItem(FileName);
-  Core.Grammer := TGrammer.Create;
-  Core.Grammer.OnChange := GrammerChange;
-  Core.Grammer.OnDestroy := GrammerDestroy;
-  Core.Grammer.LoadFromXmlFile(FileName);
-  Core.Grammer.Change;
+  AProjectClose.Execute;
+  if not Assigned(Core.Grammer) then begin
+    LastOpenedList1.AddItem(FileName);
+    ProjectNew;
+    Core.Grammer := TGrammer.Create;
+    Core.Grammer.OnChange := GrammerChange;
+    Core.Grammer.OnDestroy := GrammerDestroy;
+    Core.Grammer.LoadFromXmlFile(FileName);
+    Core.Grammer.Change;
+  end;
 end;
 
@@ -326 +329 @@
 procedure TFormMain.AProjectOpenExecute(Sender: TObject);
 begin
-  AProjectClose.Execute;
-  if not Assigned(Core.Grammer) then begin
-    OpenDialog1.InitialDir := ExtractFileDir(LastOpenedList1.GetFirstFileName);
-    OpenDialog1.FileName := ExtractFileName(LastOpenedList1.GetFirstFileName);
-    if OpenDialog1.Execute then begin
-      ProjectOpen(OpenDialog1.FileName);
-    end;
+  OpenDialog1.InitialDir := ExtractFileDir(LastOpenedList1.GetFirstFileName);
+  OpenDialog1.FileName := ExtractFileName(LastOpenedList1.GetFirstFileName);
+  if OpenDialog1.Execute then begin
+    ProjectOpen(OpenDialog1.FileName);
   end;
 end;