TeaSpeak/TeaSpeakLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed crash in server

Browse Source
This commit is contained in:
WolverinDEV 2019-07-04 20:35:09 +02:00
parent 96d2ca28a8
commit 91ae593110
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/EventLoop.cpp
View File

@ -204,12 +204,17 @@ void EventExecutor::_executor(ts::event::EventExecutor *loop) {
} }
auto event_handler = linked_entry->entry.lock(); auto event_handler = linked_entry->entry.lock();
if(!event_handler) {
/* event handler passed away while waiting for beeing executed */
delete linked_entry;
continue;
}
sassert(event_handler->_event_ptr == linked_entry); sassert(event_handler->_event_ptr == linked_entry);
event_handler->_event_ptr = nullptr; event_handler->_event_ptr = nullptr;
lock.unlock(); lock.unlock();
if(event_handler) event_handler->event_execute(linked_entry->scheduled);
event_handler->event_execute(linked_entry->scheduled);
delete linked_entry; delete linked_entry;
} }
} }

3
src/misc/timer.h
View File

@ -33,4 +33,5 @@ name ##_timings.timings.push_back({step, std::chrono::system_clock::now()});
tp = entry.ts; \ tp = entry.ts; \
} \ } \
return result; \ return result; \
})() })()
/* FIX the "backslash-newline at end of file" warning */