Skip to content

Commit

Permalink
Only use wine64 macOS Catalina and above and wine32on64 isn't availab…
Browse files Browse the repository at this point in the history
…le, remove runWithStartExe 32Bit executables not running isn't related its executables with spaces causing the issue
  • Loading branch information
Gcenx committed Jan 4, 2020
1 parent bd74e45 commit a642158
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions WineskinLauncher/WineskinLauncherAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,9 @@ - (void)mainRun:(NSArray*)filesToOpen

//set the wine executable to be used.
//can't trust the Engine is named correctly so check the actual binary files
if ([fm fileExistsAtPath:[NSString stringWithFormat:@"%@/wine64",pathToWineBinFolder]])
if ([fm fileExistsAtPath:[NSString stringWithFormat:@"%@/wine64",pathToWineBinFolder]] && ![fm fileExistsAtPath:[NSString stringWithFormat:@"%@/wine32on64",pathToWineBinFolder]] && IS_SYSTEM_MAC_OS_10_15_OR_SUPERIOR)
{
wineExecutable = @"wine64";
runWithStartExe = YES; // workaround for some 32bit exe launch issues
}
else if ([fm fileExistsAtPath:[NSString stringWithFormat:@"%@/wine32on64",pathToWineBinFolder]] && IS_SYSTEM_MAC_OS_10_15_OR_SUPERIOR)
{
Expand Down

0 comments on commit a642158

Please sign in to comment.