Merge 0746f0c into 32cdaf0

sakura-editor · Mar 1, 2021 · 72c07cf · 72c07cf
2 parents 32cdaf0 + 0746f0c
commit 72c07cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sakura_core/_main/CProcessFactory.cpp b/sakura_core/_main/CProcessFactory.cpp
@@ -258,7 +258,7 @@ bool CProcessFactory::WaitForInitializedControlProcess()
 		return false;
 	}
 	DWORD dwRet;
-	dwRet = ::WaitForSingleObject( hEvent, 10000 );	// 最大10秒間待つ
+	dwRet = ::WaitForSingleObject( hEvent, 30000 );
 	if( WAIT_TIMEOUT == dwRet ){	// コントロールプロセスの初期化が終了しない
 		::CloseHandle( hEvent );
 		TopErrorMessage( NULL, L"エディタまたはシステムがビジー状態です。\nしばらく待って開きなおしてください。" );

diff --git a/tests/unittests/test-winmain.cpp b/tests/unittests/test-winmain.cpp
@@ -151,7 +151,7 @@ void CControlProcess_WaitForInitialized(std::wstring_view profileName)
 	handleHolder eventHolder( hEvent );
 
 	// 初期化完了イベントを待つ
-	DWORD dwRet = ::WaitForSingleObject( hEvent, 10000 );
+	DWORD dwRet = ::WaitForSingleObject( hEvent, 30000 );
 	if( WAIT_TIMEOUT == dwRet ){
 		throw std::runtime_error( "waitEvent is timeout." );
 	}