From d7b59ad6bc4f5336642a4d0cda3de7f66f35dcf5 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Sun, 20 May 2018 12:35:54 +0200
Subject: [PATCH] Revert "reconnect: quick & dirty fix"

This reverts commit 1112092cb2df0d7d2006e6ced5ab48cf7308635a.
---
 CMakeLists.txt | 2 +-
 src/main.cpp   | 1 -
 src/masto.cpp  | 5 +----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b305ff..24b9021 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.7)
 project (expandurl-mastodon
-         VERSION 0.3.4
+         VERSION 0.3.3
          LANGUAGES CXX
 )
 
diff --git a/src/main.cpp b/src/main.cpp
index e8a7b3a..efd2791 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,7 +64,6 @@ int main(int argc, char *argv[])
             cout << "DEBUG: Reestablishing connection...\n";
             listener.stop();
             listener.start();
-            cout << "DEBUG: Reestablished connection.\n";
         }
 
         for (Easy::Notification &notif : listener.get_new_messages())
diff --git a/src/masto.cpp b/src/masto.cpp
index 464755a..fb06748 100644
--- a/src/masto.cpp
+++ b/src/masto.cpp
@@ -77,10 +77,7 @@ const void Listener::stop()
     if (_ptr)
     {
         _ptr->cancel_stream();
-        if (_running)
-        {
-            _thread.join();
-        }
+        _thread.join();
         _ptr.reset();
         _stream = "";
     }