Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix sporadic hang in QLocalServer::close() in OS X 10.7
  Qt Linguist: Fix crash after select 2nd translation in lengthvariant

1 files changed, 4 insertions, 4 deletions

diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index 851e898..390712c 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -167,16 +167,16 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
  */
 void QLocalServerPrivate::closeServer()
 {
-    if (-1 != listenSocket)
-        QT_CLOSE(listenSocket);
-    listenSocket = -1;
-
     if (socketNotifier) {
         socketNotifier->setEnabled(false); // Otherwise, closed socket is checked before deleter runs
         socketNotifier->deleteLater();
         socketNotifier = 0;
     }
 
+    if (-1 != listenSocket)
+        QT_CLOSE(listenSocket);
+    listenSocket = -1;
+
     if (!fullServerName.isEmpty())
         QFile::remove(fullServerName);
 }