the endless quest to plug memory leaks -- episode 379

1 files changed, 9 insertions, 3 deletions

diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc
index 7c4898056f..c813eeea63 100644
--- a/gtk2_ardour/luainstance.cc
+++ b/gtk2_ardour/luainstance.cc
@@ -1646,11 +1646,13 @@ LuaCallback::set_session (ARDOUR::Session *s)
 {
 	SessionHandlePtr::set_session (s);
 
-	if (_session) {
-		lua_State* L = lua.getState();
-		LuaBindings::set_session (L, _session);
+	if (!_session) {
+		return;
 	}
 
+	lua_State* L = lua.getState();
+	LuaBindings::set_session (L, _session);
+
 	reconnect();
 }
 
@@ -1664,6 +1666,10 @@ LuaCallback::session_going_away ()
 	_session = 0;
 
 	drop_callback (); /* EMIT SIGNAL */
+
+	lua_State* L = lua.getState();
+	LuaBindings::set_session (L, 0);
+	lua.do_command ("collectgarbage();");
 }
 
 void