Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
aglv committed Oct 29, 2015
2 parents d8f9462 + 24bae7f commit d9d0c56
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions OsiriXClasses/DICOMFiles/AppController.m
Original file line number Diff line number Diff line change
Expand Up @@ -687,12 +687,12 @@ +(BOOL) hasMacOSX1083
return YES;
}

+(BOOL) hasMacOSXSyrah
+(BOOL) isUnsupportedOS
{
SInt32 OSXversionMajor, OSXversionMinor;
if(Gestalt(gestaltSystemVersionMajor, &OSXversionMajor) == noErr && Gestalt(gestaltSystemVersionMinor, &OSXversionMinor) == noErr)
{
if(OSXversionMajor == 10 && OSXversionMinor >= 10)
if(OSXversionMajor == 10 && OSXversionMinor > 11)
{
return YES;
}
Expand Down Expand Up @@ -4099,7 +4099,7 @@ - (void) applicationWillFinishLaunching: (NSNotification *) aNotification
}
}

if( [AppController hasMacOSXSyrah])
if( [AppController isUnsupportedOS])
{
NSAlert* alert = [[NSAlert new] autorelease];
[alert setMessageText: NSLocalizedString( @"Mac OS Version", nil)];
Expand Down

0 comments on commit d9d0c56

Please sign in to comment.