@@ -95,24 +95,8 @@ bool IsInitialized() { return g_initialized; }
9595// Call this function when Analytics is no longer needed to free up resources.
9696void Terminate () {
9797#if defined(_WIN32)
98- // FirebaseAnalytics_UnloadDynamicFunctions(); // This should be called by the
99- // dynamic functions manager if needed or handled by the loaded module itself
100- // upon unload. If FirebaseAnalytics_UnloadDynamicFunctions clears function
101- // pointers, it's okay, but typically not called directly before FreeLibrary
102- // unless it's managing internal state that needs reset.
103- // For now, assuming FreeLibrary is sufficient for module cleanup.
10498 if (g_analytics_module) {
105- // Before freeing the library, ensure any dynamic functions are cleared if
106- // necessary, though FirebaseAnalytics_LoadDynamicFunctions is usually
107- // paired with an unload at a higher level or the dynamic function pointers
108- // are simply nulled out. FirebaseAnalytics_UnloadDynamicFunctions(); //
109- // Re-evaluating placement, typically called if functions are globally
110- // stored. If they are member of a class, destructor handles it. Given it's
111- // C-style, it might clear global pointers. This is generally okay to call
112- // before FreeLibrary.
113- FirebaseAnalytics_UnloadDynamicFunctions (); // Explicitly clear function
114- // pointers from dynamic
115- // loading.
99+ FirebaseAnalytics_UnloadDynamicFunctions ();
116100 FreeLibrary (g_analytics_module);
117101 g_analytics_module = 0 ;
118102 }
0 commit comments