Skip to content

Commit

Permalink
Merge pull request #60 from idietmoran/develop
Browse files Browse the repository at this point in the history
Fixed an issue where save button would not be disabled properly
  • Loading branch information
Stateford committed Sep 22, 2018
2 parents 1e1c1de + 8e2a5c7 commit c3012e3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '{branch}/2.0.0.{build}'
version: '{branch}/2.0.1.{build}'

branches:
only:
Expand All @@ -24,7 +24,7 @@ for:

artifacts:
- path: $(platform)\$(CONFIGURATION)\Display-Lock.exe
name: master/displayLock
name: master/


# for develop branch
Expand All @@ -38,7 +38,7 @@ for:

artifacts:
- path: $(platform)\$(CONFIGURATION)\Display-Lock.exe
name: develop/displayLock
name: develop/


before_build:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
All notable changes to this project will be documented in this file

# [2.0.1]
### Fixed
- Fixed an issue where the save button was not being disabled when something was saved

# [2.0.0]
### Fixed
- Fixed an issue where the program wouls sometimes crash when reading / writing a file
Expand Down
1 change: 1 addition & 0 deletions Display-Lock/DisplayLock.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ INT_PTR CALLBACK settingsViewProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
break;

case IDC_BUTTON_SETTINGS_SAVE:
EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SETTINGS_SAVE), FALSE);
settingsSave(settingsControls, settings, &previousSettings);
break;

Expand Down

0 comments on commit c3012e3

Please sign in to comment.