From 366f880fdefa5894a6d5e4319d5c2722db6c30c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 18 Mar 2015 18:46:19 +0100
Subject: [PATCH] merged

---
 YACReaderLibrary/server_config_dialog.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp
index 04b87071..a44a5271 100644
--- a/YACReaderLibrary/server_config_dialog.cpp
+++ b/YACReaderLibrary/server_config_dialog.cpp
@@ -249,10 +249,13 @@ void ServerConfigDialog::generateQR()
 	}
 #endif
 
-    stl::sort(otherAddresses.begin(),otherAddresses.end(),ipComparator);
+    std::sort(otherAddresses.begin(),otherAddresses.end(),ipComparator);
 
-    if(otherAddresses.length()>0)
-        dir = otherAddresses.pop_front();
+    if(!otherAddresses.isEmpty())
+    {
+        dir = otherAddresses.first();
+        otherAddresses.pop_front();
+    }
 
 	if(otherAddresses.length()>0 || !dir.isEmpty())
 	{