Skip to content

Commit

Permalink
2.3.2.1 - Fixed bug with inactive schedules that should not perform a…
Browse files Browse the repository at this point in the history
…ny actions when inactive.
  • Loading branch information
gavinkendall committed Aug 17, 2020
1 parent 1c8541b commit 3e9047a
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.2.0")]
[assembly: AssemblyFileVersion("2.3.2.0")]
[assembly: AssemblyVersion("2.3.2.1")]
[assembly: AssemblyFileVersion("2.3.2.1")]
[assembly: NeutralResourcesLanguageAttribute("en-CA")]
2 changes: 1 addition & 1 deletion app.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<assemblyIdentity
type="win32"
name="GavinKendall.AutoScreenCapture"
version="2.3.2.0"/>
version="2.3.2.1"/>
<asmv3:application>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>True/PM</dpiAware>
Expand Down
2 changes: 1 addition & 1 deletion interface/FormAbout.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="richTextBoxDeveloper.Text" xml:space="preserve">
<value>Auto Screen Capture 2.3.2.0 ("Boombayah")
<value>Auto Screen Capture 2.3.2.1 ("Boombayah")
Developed by Gavin Kendall (2008 - 2020)

https://autoscreen.sourceforge.io/
Expand Down
10 changes: 10 additions & 0 deletions interface/main/FormMain-Schedules.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ private void timerScheduledCapture_Tick(object sender, EventArgs e)
// Process the list of schedules we need to consider.
foreach (Schedule schedule in _formSchedule.ScheduleCollection)
{
if (!schedule.Active)
{
continue;
}

if ((dtNow.DayOfWeek == DayOfWeek.Monday && schedule.Monday) ||
(dtNow.DayOfWeek == DayOfWeek.Tuesday && schedule.Tuesday) ||
(dtNow.DayOfWeek == DayOfWeek.Wednesday && schedule.Wednesday) ||
Expand Down Expand Up @@ -106,6 +111,11 @@ private void timerScheduledCapture_Tick(object sender, EventArgs e)
// Process the list of triggers of condition type Date/Time and condition type Time.
foreach (Trigger trigger in _formTrigger.TriggerCollection)
{
if (!trigger.Active)
{
continue;
}

if (trigger.ConditionType == TriggerConditionType.DateTime &&
trigger.Date.ToString(MacroParser.DateFormat).Equals(dtNow.ToString(MacroParser.DateFormat)) &&
trigger.Time.ToString(MacroParser.TimeFormatForTrigger).Equals(dtNow.ToString(MacroParser.TimeFormatForTrigger)))
Expand Down
4 changes: 2 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Auto Screen Capture by Gavin Kendall
Last updated on 2020-08-14 (August 14, 2020)
[The information presented here refers to the latest version of the application (which is currently 2.3.2.0)]
Last updated on 2020-08-17 (August 17, 2020)
[The information presented here refers to the latest version of the application (which is currently 2.3.2.1)]
=============================================================================================================


Expand Down
3 changes: 2 additions & 1 deletion settings/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ public static void Initialize()
new Version(CODENAME_BOOMBAYAH, "2.3.1.6"), // Region Select Edit implemented and fixed bug with ViewId for new Screens and Regions.
new Version(CODENAME_BOOMBAYAH, "2.3.1.7"), // OptimizeScreenCapture implemented.
new Version(CODENAME_BOOMBAYAH, "2.3.1.8"), // Region Select implemented for Regions.
new Version(CODENAME_BOOMBAYAH, "2.3.1.9") // Schedules can now have their own interval set for them separate from the main interval. Also fixed bug with screen capture duration info.
new Version(CODENAME_BOOMBAYAH, "2.3.1.9"), // Schedules can now have their own interval set for them separate from the main interval. Also fixed bug with screen capture duration info.
new Version(CODENAME_BOOMBAYAH, "2.3.2.0") // Region Select Auto Save region is created if the regions.xml file is not found so you can view screenshots taken with Region Select Auto Save.
};

Application = new SettingCollection
Expand Down

0 comments on commit 3e9047a

Please sign in to comment.