Merge branch 'master' of github.com:ncsoft/Unreal.js-core

ncsoft · Jun 5, 2017 · d7830eb · d7830eb
2 parents aa4c49f + 4d8a0ea
commit d7830eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/JavascriptUMG/JavascriptWindow.cpp b/Source/JavascriptUMG/JavascriptWindow.cpp
@@ -45,7 +45,7 @@ TSharedRef<SWidget> UJavascriptWindow::RebuildWidget()
 		.SizingRule((ESizingRule)SizingRule)
 		.IsPopupWindow(IsPopupWindow)
 		.FocusWhenFirstShown(FocusWhenFirstShown)
-		.ActivateWhenFirstShown(ActivateWhenFirstShown)
+		.ActivationPolicy(EWindowActivationPolicy::FirstShown)
 		.UseOSWindowBorder(UseOSWindowBorder)
 		.HasCloseButton(HasCloseButton)
 		.SupportsMaximize(SupportsMaximize)
@@ -138,4 +138,4 @@ void UJavascriptWindow::SetOpacity(const float InOpacity)
 	{
 		MyWindow->SetOpacity(InOpacity);
 	}
-}
+}
diff --git a/Source/V8/Private/V8Module.cpp b/Source/V8/Private/V8Module.cpp
@@ -35,7 +35,7 @@ static float GV8IdleTaskBudget = 1 / 60.0f;
 UJavascriptSettings::UJavascriptSettings(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
-	V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-debug-as=v8debug --expose-gc --harmony_simd");
+	V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-gc");
 }
 
 void UJavascriptSettings::Apply() const