From b3e9024fb56c0a6c5df5854388ddcec64694c5ea Mon Sep 17 00:00:00 2001 From: jeefo Date: Sat, 21 Sep 2019 23:56:01 +0300 Subject: [PATCH] Clear bots array upon meta unload. --- project/makefile | 7 ++----- source/linkage.cpp | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/makefile b/project/makefile index 59160e8..409e0cb 100644 --- a/project/makefile +++ b/project/makefile @@ -19,7 +19,6 @@ ifeq "$(DEBUG)" "true" else COMPILER_FLAGS += -pipe -O3 -march=core2 -msse2 -mfpmath=sse -fno-builtin -fno-threadsafe-statics -funroll-loops -fomit-frame-pointer -fno-stack-protector -fvisibility=hidden -fvisibility-inlines-hidden BINARY_DIR = release - LINKER_FLAGS += -static-libgcc endif INCLUDE = -I../include @@ -35,15 +34,13 @@ ifeq "$(OSX)" "true" LINKER_FLAGS += -dynamiclib -lstdc++ -mmacosx-version-min=10.9 -arch i386 else LIBRARY_EXT = so - LINKER_FLAGS += -shared + LINKER_FLAGS += -shared -static-libgcc endif BINARY_OUTPUT = $(PROJECT).$(LIBRARY_EXT) ifeq ($(findstring clang,$(COMPILER)),clang) - ifeq "$(OSX)" "false" - LINKER_FLAGS += -lgcc_eh - else + ifneq "$(OSX)" "false" ifeq "$(DEBUG)" "true" LINKER_FLAGS += -lstdc++ else diff --git a/source/linkage.cpp b/source/linkage.cpp index c75d2fe..671910f 100644 --- a/source/linkage.cpp +++ b/source/linkage.cpp @@ -893,6 +893,9 @@ CR_EXPORT int Meta_Detach (PLUG_LOADTIME now, PL_UNLOAD_REASON reason) { graph.savePractice (); util.disableSendTo (); + // make sure all stuff cleared + bots.destroy (); + return true; }