From c1d8ca04308f6275073aaccae02a9657965e62e7 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 14 Jul 2018 16:01:25 +0000 Subject: [PATCH] this made no sense --- .../serverScript/src/shared/JavaLibrary.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index 75f83e68..b1b9b5be 100755 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -954,13 +954,13 @@ void JavaLibrary::install(void) if (ms_instance == nullptr) { JavaLibrary *lib = new JavaLibrary; - if (lib != ms_instance) + if (lib) { - if (ms_instance == nullptr) - { - delete lib; - if (ms_javaVmType != JV_none) - FATAL(true, ("Unable to initialize Java")); + ms_instance = lib; + } else { + delete lib; + if (ms_javaVmType != JV_none) { + FATAL(true, ("Unable to initialize Java")); } } } @@ -975,7 +975,7 @@ void JavaLibrary::install(void) */ void JavaLibrary::remove(void) { - if (ms_instance != nullptr) + if (ms_instance) { JavaLibrary * temp = ms_instance; ms_instance = nullptr;