(LogSession): исправлена ошибка некорректного завершения сессии..

8df67095 · Pavel Vainerman · 0a5d05e4 · 8df67095
Commit 8df67095 authored May 11, 2015 by Pavel Vainerman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

LogSession.cc src/Log/LogSession.cc +2 -6

No files found.
--- a/src/Log/LogSession.cc
+++ b/src/Log/LogSession.cc
@@ -16,13 +16,11 @@ using namespace UniSetTypes;
 // -------------------------------------------------------------------------
 LogSession::~LogSession()
 {
-	cancelled = true;
-
 	if( isRunning() )
 	{
+		cancelled = true;
+		ost::Thread::join();
 		disconnect();
-		//        if( isRunning() )
-		//            ost::Thread::join();
 	}
 }
 // -------------------------------------------------------------------------
@@ -277,8 +275,6 @@ void LogSession::final()
 	{

 	}
-
-	delete this;
 }
 // -------------------------------------------------------------------------
 void LogSession::connectFinalSession( FinalSlot sl )