Forráskód Böngészése

apply review comments for CAndroidVMHelper

Andrii Danylchenko 7 éve
szülő
commit
dcbcff41dc

+ 4 - 3
client/CServerHandler.cpp

@@ -155,9 +155,10 @@ void CServerHandler::startLocalServerAndConnect()
 
 	th->update();
 #ifdef VCMI_ANDROID
-	CAndroidVMHelper envHelper;
-	envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true);
-	envHelper.Detach();
+	{
+		CAndroidVMHelper envHelper;
+		envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true);
+	}
 #else
 	threadRunLocalServer = std::make_shared<boost::thread>(&CServerHandler::threadRunServer, this); //runs server executable;
 #endif

+ 0 - 5
lib/CAndroidVMHelper.cpp

@@ -43,11 +43,6 @@ CAndroidVMHelper::CAndroidVMHelper()
 	}
 }
 CAndroidVMHelper::~CAndroidVMHelper()
-{
-	Detach();
-}
-
-void CAndroidVMHelper::Detach()
 {
 	if(envPtr && detachInDestructor)
 	{

+ 0 - 2
lib/CAndroidVMHelper.h

@@ -29,8 +29,6 @@ public:
 
 	~CAndroidVMHelper();
 
-	void Detach();
-
 	JNIEnv * get();
 
 	jclass findClassloadedClass(const std::string & name);

+ 0 - 1
server/CVCMIServer.cpp

@@ -179,7 +179,6 @@ void CVCMIServer::run()
 #else
 		CAndroidVMHelper vmHelper;
 		vmHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "onServerReady");
-		vmHelper.Detach();
 #endif
 	}