Browse Source

CH: a few bug fixes when closing without the extended dialog and also with the stack trace routines

Jean-Francois Goulet 20 years ago
parent
commit
6ee9b0eb4d

BIN
LuaEdit/Bin/LuaEdit.exe


+ 1 - 1
LuaEdit/EditorSettings.dfm

@@ -119,7 +119,7 @@ object frmEditorSettings: TfrmEditorSettings
       Top = 0
       Width = 492
       Height = 375
-      ActivePage = stabColors
+      ActivePage = stabGeneral
       Align = alClient
       TabOrder = 0
       object stabGeneral: TTabSheet

+ 1 - 0
LuaEdit/EditorSettings.pas

@@ -586,6 +586,7 @@ begin
   chkFileAssociate.Checked := AssociateFiles;
   chkSaveProjectsInc.Checked := SaveProjectsInc;
   chkSaveUnitsInc.Checked := SaveUnitsInc;
+  chkShowExSaveDlg.Checked := ShowExSaveDlg;
 
   txtUndoLimit.Text := IntToStr(Main.UndoLimit);
   txtTabWidth.Text := IntToStr(Main.TabWidth);

+ 2 - 2
LuaEdit/LuaEdit.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=2
 MinorVer=0
 Release=1
-Build=595
+Build=600
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=Open Source
 FileDescription=IDE for Lua 5.0.2
-FileVersion=2.0.1.595
+FileVersion=2.0.1.600
 InternalName=LuaEdit
 LegalCopyright=LuaEdit Copyright 2004-2005 ©
 LegalTrademarks=

BIN
LuaEdit/LuaEdit.res


+ 6 - 1
LuaEdit/Main.pas

@@ -3198,6 +3198,7 @@ var
     if (not Pause) then
     begin
       pLuaUnit.pDebugInfos.iCurrentLineDebug := -1;
+      pLuaUnit.pDebugInfos.iStackMarker := -1;
 
       if Assigned(pCurrentSynEdit) then
         pCurrentSynEdit.Refresh;
@@ -3514,7 +3515,7 @@ begin
       begin
         // Adding to CallStack...
         pBreakInfo := TBreakInfo.Create;
-        pBreakInfo.FileName := pLuaUnit.sName;
+        pBreakInfo.FileName := pLuaUnit.sUnitPath;
 
         if AR.what <> 'C' then
         begin
@@ -3926,6 +3927,10 @@ begin
     end;
   end;
 
+  // Initialize stuff...
+  frmExSaveExit := nil;
+
+  // Determines closing method...
   if ShowExSaveDlg then
   begin
     // Create form

+ 1 - 1
LuaEdit/Stack.pas

@@ -54,7 +54,7 @@ begin
 
       frmStack.lstCallStack.Items.EndUpdate;
       lstCallStack.Selected.ImageIndex := 1;
-      frmMain.PopUpUnitToScreen(pBreakInfo.FileName, pBreakInfo.Line).pDebugInfos.iStackMarker := pBreakInfo.Line;
+      frmMain.PopUpUnitToScreen(pBreakInfo.FileName, pBreakInfo.Line).pDebugInfos.iStackMarker := pBreakInfo.Line+1;
       pCurrentSynEdit.Refresh;
     end;
   end;