From ec790837534062b7fe2d322cdcd9cf3f442dc84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ignacio=20Rodr=C3=ADguez?= <ignacio-external@symless.com>
Date: Wed, 20 Jan 2021 16:56:26 +0700
Subject: [PATCH] Removing positional union initialisation (#6918)

* Removing positional union initialisation

* udpated changelog
---
 ChangeLog                  | 1 +
 src/lib/synergy/KeyMap.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7f518cd1..fdf1d2277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Bug fixes:
 - #6900 Remaining SonarCloud reported bug items (test fixed)
 - #6889 Systray Icon on Ubuntu Auto Start (take 2)
 - #6910 Don't use the word “Version” for release names because it can lead to errors during update checking.
+- #6918 Removing positional union initialisation
 ===========
 
 v1.13.0-stable
diff --git a/src/lib/synergy/KeyMap.cpp b/src/lib/synergy/KeyMap.cpp
index 0b0b4a4bf..dda91fbd0 100644
--- a/src/lib/synergy/KeyMap.cpp
+++ b/src/lib/synergy/KeyMap.cpp
@@ -1329,13 +1329,18 @@ KeyMap::Keystroke::Keystroke(KeyButton button,
                 bool press, bool repeat, UInt32 data) :
     m_type(kButton), m_data{}
 {
-    m_data.m_button = {button, press, repeat, data};
+    m_data.m_button.m_button = button;
+    m_data.m_button.m_press = press;
+    m_data.m_button.m_repeat = repeat;
+    m_data.m_button.m_client = data;
 }
 
 KeyMap::Keystroke::Keystroke(SInt32 group, bool absolute, bool restore) :
     m_type(kGroup), m_data{}
 {
-    m_data.m_group = {group, absolute, restore};
+    m_data.m_group.m_group = group;
+    m_data.m_group.m_absolute = absolute;
+    m_data.m_group.m_restore = restore;
 }
 
 }