games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-13 22:06:58 +02:00
Code Issues Releases Activity

apply review comments for CAndroidVMHelper

Browse Source
This commit is contained in:
Andrii Danylchenko 2018-05-26 14:50:49 +03:00
parent ee033e9c9c
commit dcbcff41dc
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/CServerHandler.cpp
View File

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

5
lib/CAndroidVMHelper.cpp
View File

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

2
lib/CAndroidVMHelper.h
View File

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

1
server/CVCMIServer.cpp
View File

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