tastytea
/
expandurl-mastodon
1
0
Fork 0
Code Issues 1 Pull Requests Releases 5 Wiki Activity

Revert "reconnect: quick & dirty fix" 

This reverts commit 1112092cb2.
This commit is contained in:
tastytea 2018-05-20 12:35:54 +02:00
parent 1112092cb2
commit d7b59ad6bc
Signed by: tastytea
GPG Key ID: 59346E0EA35C67E5
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.7) cmake_minimum_required (VERSION 3.7)
project (expandurl-mastodon project (expandurl-mastodon
VERSION 0.3.4 VERSION 0.3.3
LANGUAGES CXX LANGUAGES CXX
) )

1
src/main.cpp
View File

@ -64,7 +64,6 @@ int main(int argc, char *argv[])
cout << "DEBUG: Reestablishing connection...\n"; cout << "DEBUG: Reestablishing connection...\n";
listener.stop(); listener.stop();
listener.start(); listener.start();
cout << "DEBUG: Reestablished connection.\n";
} }
for (Easy::Notification &notif : listener.get_new_messages()) for (Easy::Notification &notif : listener.get_new_messages())

5
src/masto.cpp
View File

@ -77,10 +77,7 @@ const void Listener::stop()
if (_ptr) if (_ptr)
{ {
_ptr->cancel_stream(); _ptr->cancel_stream();
if (_running) _thread.join();
{
_thread.join();
}
_ptr.reset(); _ptr.reset();
_stream = ""; _stream = "";
} }