From 631bd92de9b771c7e8da0948fc39c8dc55ca2aaf Mon Sep 17 00:00:00 2001 From: HanzZ Date: Tue, 12 Feb 2013 21:43:34 +0100 Subject: [PATCH] Skype: Try to ShutdownProtobufLibrary() before exit --- backends/skype/skypeplugin.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backends/skype/skypeplugin.cpp b/backends/skype/skypeplugin.cpp index bf796edc..9cd7ea58 100644 --- a/backends/skype/skypeplugin.cpp +++ b/backends/skype/skypeplugin.cpp @@ -56,6 +56,7 @@ static gboolean transportDataReceived(GIOChannel *source, GIOCondition condition if (n <= 0) { LOG4CXX_INFO(logger, "Diconnecting from spectrum2 server"); Logging::shutdownLogging(); + google::protobuf::ShutdownProtobufLibrary(); exit(errno); } std::string d = std::string(buffer, n); @@ -76,6 +77,7 @@ static int create_socket(const char *host, int portno) { // strerror() will not work for gethostbyname() and hstrerror() // is supposedly obsolete Logging::shutdownLogging(); + google::protobuf::ShutdownProtobufLibrary(); exit(1); } serv_addr.sin_addr.s_addr = *((unsigned long *) hos->h_addr_list[0]); @@ -93,6 +95,7 @@ static int create_socket(const char *host, int portno) { static void io_destroy(gpointer data) { Logging::shutdownLogging(); + google::protobuf::ShutdownProtobufLibrary(); exit(1); } @@ -148,6 +151,7 @@ void SkypePlugin::handleLogoutRequest(const std::string &user, const std::string LOG4CXX_INFO(logger, "User wants to logout, logging out"); skype->logout(); Logging::shutdownLogging(); + google::protobuf::ShutdownProtobufLibrary(); exit(1); } }