From 155c96586648588ef73edc91c4198d6e3738a2f9 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Fri, 17 Apr 2015 12:30:54 +0200
Subject: [PATCH] Prevent another crash in ~SocketApi #3118

Since the QLocalServer parent of the QLocalSockets gets destroyed
after the _listeners QList, onLostConnection might try to update
an already destroyed list.

Fix the issue by simply making sure that _localServer is destroyed
first.
---
 src/gui/socketapi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/socketapi.h b/src/gui/socketapi.h
index 3be14f746..97f7b9ad1 100644
--- a/src/gui/socketapi.h
+++ b/src/gui/socketapi.h
@@ -82,8 +82,8 @@ private:
     Q_INVOKABLE void command_SHARE_MENU_TITLE(const QString& argument, QLocalSocket* socket);
     QString buildRegisterPathMessage(const QString& path);
 
-    QLocalServer _localServer;
     QList<QLocalSocket*> _listeners;
+    QLocalServer _localServer;
     c_strlist_t *_excludes;
     QHash<Folder*, SqlQuery*> _dbQueries;
     QHash<Folder*, SqlDatabase*> _openDbs;
-- 
2.30.2