From 5a490a8b5a4c00f2a1cfbdda30d486a651f4143c Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Mon, 26 Aug 2019 17:31:49 +0200
Subject: [PATCH] SingleApplication: Fallback to qgetenv for username on
 Windows too

---
 3rdparty/singleapplication/singleapplication_p.cpp     | 3 +++
 3rdparty/singleapplication/singlecoreapplication_p.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/3rdparty/singleapplication/singleapplication_p.cpp b/3rdparty/singleapplication/singleapplication_p.cpp
index 807b6213a..9de965fa8 100644
--- a/3rdparty/singleapplication/singleapplication_p.cpp
+++ b/3rdparty/singleapplication/singleapplication_p.cpp
@@ -132,6 +132,9 @@ void SingleApplicationPrivate::genBlockServerName() {
     if (GetUserNameW(username, &usernameLength)) {
       appData.addData(QString::fromWCharArray(username).toUtf8());
     }
+    else {
+      appData.addData(qgetenv("USERNAME"));
+    }
 #endif
   }
 
diff --git a/3rdparty/singleapplication/singlecoreapplication_p.cpp b/3rdparty/singleapplication/singlecoreapplication_p.cpp
index 5d239ae56..75df19fbd 100644
--- a/3rdparty/singleapplication/singlecoreapplication_p.cpp
+++ b/3rdparty/singleapplication/singlecoreapplication_p.cpp
@@ -132,6 +132,9 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
     if (GetUserNameW(username, &usernameLength)) {
       appData.addData(QString::fromWCharArray(username).toUtf8());
     }
+    else {
+      appData.addData(qgetenv("USERNAME"));
+    }
 #endif
   }