Skip to content

Commit

Permalink
Fixed possible crash in View MakeFile
Browse files Browse the repository at this point in the history
JohanMes committed Feb 1, 2015
1 parent 0ed97b3 commit 3af6275
Showing 4 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions NEWS.txt
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ Version 5.9.2 - 1 Februari 2015
- Changed Format Current File shortcut from Shift+F to Shift+Ctrl+A.
- Removed/Changed all default Alt+(Key) shortcuts because they interfere with Alt menu navigation.
- Assigned some new default shortcuts like Ctrl+B (Open Containing Folder) and F2 (Rename File).
- Fixed Show Makefile being executable when no compiler set is configured.

Version 5.9.1 - 31 Januari 2015

3 changes: 2 additions & 1 deletion Source/TODO.txt
Original file line number Diff line number Diff line change
@@ -8,4 +8,5 @@
- Messy painting of find results list
- Add proxy support to webupdate
- Unify look and feel of all windows
- Test TDM-GCC 4.9.x
- Test TDM-GCC 4.9.x
- Rename file
2 changes: 1 addition & 1 deletion Source/main.dfm
Original file line number Diff line number Diff line change
@@ -2150,7 +2150,7 @@ object MainForm: TMainForm
Category = 'Project'
Caption = 'Edit &Makefile'
OnExecute = actProjectMakeFileExecute
OnUpdate = actUpdateProject
OnUpdate = actUpdateMakeFile
end
object actProjectSource: TAction
Tag = 6
7 changes: 7 additions & 0 deletions Source/main.pas
Original file line number Diff line number Diff line change
@@ -611,6 +611,7 @@ TMainForm = class(TForm)
procedure actMsgHideExecute(Sender: TObject);
procedure actUpdatePageCount(Sender: TObject); // enable on pagecount> 0
procedure actUpdateProject(Sender: TObject); // enable on fproject assigned
procedure actUpdateMakeFile(Sender: TObject); // enable on fproject assigned and compilation allowed
procedure actUpdatePageorProject(Sender: TObject); // enable on either of above
procedure actUpdateEmptyEditor(Sender: TObject); // enable on unempty editor
procedure actUpdateDebuggerRunning(Sender: TObject); // enable when debugger running
@@ -3222,6 +3223,12 @@ procedure TMainForm.actUpdateProject(Sender: TObject);
TCustomAction(Sender).Enabled := assigned(fProject);
end;

procedure TMainForm.actUpdateMakeFile(Sender: TObject);
begin
TCustomAction(Sender).Enabled := assigned(fProject) and (not fCompiler.Compiling) and (GetCompileTarget <> ctNone) and
Assigned(devCompilerSets.CompilationSet);
end;

procedure TMainForm.actUpdateEmptyEditor(Sender: TObject);
var
e: TEditor;

0 comments on commit 3af6275

Please sign in to comment.