1 files changed, 7 insertions, 11 deletions
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index 6c4aa1898..f75bbfb33 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -35,23 +35,19 @@ UPnP::Manager* g_pManager = 0;
 
 static bool upnp_kvs_fnc_getExternalIpAddress(KviKvsModuleFunctionCall * c)
 {
-	QString buffer;
-
 	if(g_pManager)
-		buffer = g_pManager->getExternalIpAddress();
-
-	c->returnValue()->setString(buffer);
+	{
+	  c->returnValue()->setString(g_pManager->getExternalIpAddress());
+	}
 	return true;
 }
 
 static bool upnp_kvs_fnc_isGatewayAvailable(KviKvsModuleFunctionCall * c)
 {
-	bool avail;
-
-	if(g_pManager)
-		avail = g_pManager->isGatewayAvailable();
-
-	c->returnValue()->setBoolean(avail);
+        if (g_pManager)
+        {
+          c->returnValue()->setBoolean(g_pManager->isGatewayAvailable());
+        }
 	return true;
 }