Merge branch 'hotfix/1.1.3' into main

mouredev · Aug 17, 2021 · 7266979 · 7266979
2 parents b87ec6d + 88becfd
commit 7266979
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Twitimer.xcodeproj/project.pbxproj b/Twitimer.xcodeproj/project.pbxproj
@@ -1073,7 +1073,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Twitimer/Twitimer.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Twitimer/Preview Content\"";
 				DEVELOPMENT_TEAM = SJGR47U9J5;
 				ENABLE_PREVIEWS = YES;
@@ -1084,7 +1084,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACH_O_TYPE = mh_execute;
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mouredev.Twitimer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -1099,7 +1099,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Twitimer/Twitimer.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Twitimer/Preview Content\"";
 				DEVELOPMENT_TEAM = SJGR47U9J5;
 				ENABLE_PREVIEWS = YES;
@@ -1110,7 +1110,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACH_O_TYPE = mh_execute;
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mouredev.Twitimer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/Twitimer/Util/Extension/DateExtension.swift b/Twitimer/Util/Extension/DateExtension.swift
@@ -28,12 +28,12 @@ extension Date {
         if considerToday && dayOfWeek == searchWeekdayIndex {
             if let referenceDate = referenceDate, let duration = duration, referenceDate.addingTimeInterval(60 * 60 * Double(duration)) > self {
                 return referenceDate
-            } else if self.addingTimeInterval(60 * 60 * Double(duration ?? 0)) <= Date() {
-                return self
-            } else if save && self > Date() {
+            } else if Date() <= self.addingTimeInterval(60 * 60 * Double(duration ?? 0))
+                        || self.addingTimeInterval(60 * 60 * Double(duration ?? 0)) <= Date()
+                        || save && self > Date() {
                 return self
             }
-         }
+        }
 
         var nextDateComponent = calendar.dateComponents([.hour, .minute, .second], from: self)
         nextDateComponent.weekday = searchWeekdayIndex