Prevent another crash in ~SocketApi #3118
authorJocelyn Turcotte <jturcotte@woboq.com>
Fri, 17 Apr 2015 10:30:54 +0000 (12:30 +0200)
committerJocelyn Turcotte <jturcotte@woboq.com>
Fri, 17 Apr 2015 10:42:40 +0000 (12:42 +0200)
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

index 3be14f746a251a59efbb37214c54256aaa76e5ee..97f7b9ad14fad096d29ef2914bf8f9ac9380ddeb 100644 (file)
@@ -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;