diff --git a/Acid.Cam.v2.OSX.xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate b/Acid.Cam.v2.OSX.xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate
index 2c75d7806..2b549a9fc 100644
Binary files a/Acid.Cam.v2.OSX.xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate and b/Acid.Cam.v2.OSX.xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Acid.Cam.v2.OSX/AC_Controller.mm b/Acid.Cam.v2.OSX/AC_Controller.mm
index f1d70ca59..c7e1ad439 100755
--- a/Acid.Cam.v2.OSX/AC_Controller.mm
+++ b/Acid.Cam.v2.OSX/AC_Controller.mm
@@ -706,6 +706,10 @@ -(IBAction) startProgram: (id) sender {
return;
}
}
+ if([up4k state] == NSOffState && [chk_stretch state] == NSOnState) {
+ _NSRunAlertPanel(@"Cannot Stretch", @"Please turn off Stretching as requires resize to be enabled", @"Ok", nil, nil);
+ return;
+ }
if([up4k state] == NSOnState && [videoFileInput state] == NSOffState) {
_NSRunAlertPanel(@"Error",@" Scaling only available in video mode", @"Ok", nil,nil);
@@ -1334,13 +1338,13 @@ - (IBAction) checkChanged: (id) sender {
[video_width setEnabled: NO];
[video_height setEnabled: NO];
[chk_stretch setEnabled:NO];
+
}
else {
[video_file setEnabled: NO];
[resolution setEnabled: NO];
[device_index setEnabled: NO];
[selectVideoFile setEnabled: YES];
- [chk_repeat setEnabled:YES];
[up4k setEnabled: YES];
if([up4k state] == NSOnState) {
[video_width setEnabled: YES];
@@ -2715,6 +2719,7 @@ - (IBAction) scaleToggle: (id) sender {
[video_width setEnabled:NO];
[video_height setEnabled:NO];
[chk_stretch setEnabled:NO];
+ [chk_stretch setState: NSOffState];
} else {
[video_width setEnabled:YES];
[video_height setEnabled:YES];
diff --git a/Acid.Cam.v2.OSX/Acid.Cam.v2.OSX-Info.plist b/Acid.Cam.v2.OSX/Acid.Cam.v2.OSX-Info.plist
index eb9e0c5b3..0def6384b 100755
--- a/Acid.Cam.v2.OSX/Acid.Cam.v2.OSX-Info.plist
+++ b/Acid.Cam.v2.OSX/Acid.Cam.v2.OSX-Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.18.0 High Sierra
+ 2.18.1 High Sierra
CFBundleSignature
????
CFBundleVersion
diff --git a/Acid.Cam.v2.OSX/ac-filter1.cpp b/Acid.Cam.v2.OSX/ac-filter1.cpp
index 2f8ab7d10..76d466770 100755
--- a/Acid.Cam.v2.OSX/ac-filter1.cpp
+++ b/Acid.Cam.v2.OSX/ac-filter1.cpp
@@ -45,13 +45,13 @@
// Acid Cam namespace
namespace ac {
#if defined(__APPLE__)
- const std::string version="2.18.0 (macOS)";
+ const std::string version="2.18.1 (macOS)";
#elif defined(__linux__)
- const std::string version="2.18.0 (Linux)";
+ const std::string version="2.18.1 (Linux)";
#elif defined(_WIN32)
- const std::string version="2.18.0 (Windows)";
+ const std::string version="2.18.1 (Windows)";
#else
- const std::string version="2.18.0 (Generic)";
+ const std::string version="2.18.1 (Generic)";
#endif
// variables
int swapColor_r = 0, swapColor_g = 0, swapColor_b = 0;