From c3346f919241c99d1dcca13ff4dc412d1c35e89e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20L?= <contact@slepin.fr>
Date: Fri, 8 Sep 2017 00:23:17 +0200
Subject: [PATCH] Notifications: correct IP address formatting

---
 Utils.cpp    | 10 ++++++----
 WSServer.cpp |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Utils.cpp b/Utils.cpp
index 1f55b50c..7b7a72d9 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -386,10 +386,12 @@ void Utils::SysTrayNotify(QString &text,
 }
 
 QString Utils::FormatIPAddress(QHostAddress &addr) {
-    if (addr.protocol() == QAbstractSocket::IPv4Protocol)
-        QString v4addr = addr.toString().replace("::fff:", "");
-
-    return addr.toString();
+    QRegExp v4regex("(::ffff:)(((\\d).){3})", Qt::CaseInsensitive);
+    QString addrString = addr.toString();
+    if (addrString.contains(v4regex)) {
+        addrString = QHostAddress(addr.toIPv4Address()).toString();
+    }
+    return addrString;
 }
 
 const char* Utils::GetRecordingFolder() {
diff --git a/WSServer.cpp b/WSServer.cpp
index 877b7083..8a175b3a 100644
--- a/WSServer.cpp
+++ b/WSServer.cpp
@@ -103,7 +103,7 @@ void WSServer::onNewConnection() {
 
         QString msg = QString(obs_module_text("OBSWebsocket.ConnectNotify.ClientIP"))
             + QString(" ")
-            + clientAddr.toString();
+            + Utils::FormatIPAddress(clientAddr);
 
         Utils::SysTrayNotify(msg,
             QSystemTrayIcon::Information,
@@ -138,7 +138,7 @@ void WSServer::onSocketDisconnected() {
 
         QString msg = QString(obs_module_text("OBSWebsocket.ConnectNotify.ClientIP"))
             + QString(" ")
-            + clientAddr.toString();
+            + Utils::FormatIPAddress(clientAddr);
 
         Utils::SysTrayNotify(msg,
             QSystemTrayIcon::Information,