8049198: [macosx] Incorrect thread access when showing splash screen
Reviewed-by: serb, pchelko
This commit is contained in:
parent
f5a99dfd8f
commit
f429e5b86c
@ -45,6 +45,7 @@
|
||||
#include <dlfcn.h>
|
||||
|
||||
#include <sizecalc.h>
|
||||
#import "ThreadUtilities.h"
|
||||
|
||||
static NSScreen* SplashNSScreen()
|
||||
{
|
||||
@ -130,8 +131,12 @@ char* SplashGetScaledImageName(const char* jar, const char* file,
|
||||
NSAutoreleasePool *pool = [NSAutoreleasePool new];
|
||||
*scaleFactor = 1;
|
||||
char* scaledFile = nil;
|
||||
float screenScaleFactor = [SplashNSScreen() backingScaleFactor];
|
||||
|
||||
__block float screenScaleFactor = 1;
|
||||
|
||||
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
|
||||
screenScaleFactor = [SplashNSScreen() backingScaleFactor];
|
||||
}];
|
||||
|
||||
if (screenScaleFactor > 1) {
|
||||
NSString *fileName = [NSString stringWithUTF8String: file];
|
||||
NSUInteger length = [fileName length];
|
||||
|
Loading…
x
Reference in New Issue
Block a user