From ee994973db8ca4077ff85b8a1dc2aee48230c26e Mon Sep 17 00:00:00 2001
From: ingvar1995 <igorn1995@yandex.ru>
Date: Sat, 25 Aug 2018 14:45:58 +0300
Subject: [PATCH] toxav kill fixed

---
 toxygen/app.py           | 8 ++++++--
 toxygen/wrapper/tox.py   | 1 -
 toxygen/wrapper/toxav.py | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/toxygen/app.py b/toxygen/app.py
index e28ccea..7810751 100644
--- a/toxygen/app.py
+++ b/toxygen/app.py
@@ -107,7 +107,7 @@ class App:
         self._tray.hide()
         self._save_profile()
         self._settings.close()
-        self._calls_manager.set_toxav(None)
+        self._kill_toxav()
         del self._tox
 
     # -----------------------------------------------------------------------------------------------------------------
@@ -319,7 +319,7 @@ class App:
         self._stop_threads(False)
         data = self._tox.get_savedata()
         self._save_profile(data)
-        self._calls_manager.set_toxav(None)
+        self._kill_toxav()
         del self._tox
         # create new tox instance
         self._tox = self._create_tox(data)
@@ -411,3 +411,7 @@ class App:
     def _init_profile(self):
         if not self._profile.has_avatar():
             self._profile.reset_avatar(self._settings['identicons'])
+
+    def _kill_toxav(self):
+        self._calls_manager.set_toxav(None)
+        self._tox.AV.kill()
diff --git a/toxygen/wrapper/tox.py b/toxygen/wrapper/tox.py
index 1ba0bbc..6ca7741 100644
--- a/toxygen/wrapper/tox.py
+++ b/toxygen/wrapper/tox.py
@@ -121,7 +121,6 @@ class Tox:
             self.AV = ToxAV(self._tox_pointer)
 
     def __del__(self):
-        del self.AV
         Tox.libtoxcore.tox_kill(self._tox_pointer)
 
     # -----------------------------------------------------------------------------------------------------------------
diff --git a/toxygen/wrapper/toxav.py b/toxygen/wrapper/toxav.py
index 78ab11f..be61309 100644
--- a/toxygen/wrapper/toxav.py
+++ b/toxygen/wrapper/toxav.py
@@ -40,7 +40,7 @@ class ToxAV:
         self.video_receive_frame_cb = None
         self.call_cb = None
 
-    def __del__(self):
+    def kill(self):
         """
         Releases all resources associated with the A/V session.