From 6c6e2b6bd3d7b6623471505293ad7c2b3bc447d1 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <Jamie@symless.com>
Date: Tue, 30 Apr 2019 15:49:23 +0100
Subject: [PATCH] #6471 Reverted accidental change and fixed more tabs

---
 src/gui/src/MainWindow.h          | 4 ++--
 src/lib/platform/XWindowsUtil.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 1cc737a4..f4df8f4b 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -74,7 +74,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
             synergyConnecting,
             synergyConnected,
             synergyListening,
-			synergyPendingRetry
+            synergyPendingRetry
         };
 
         enum qSynergyType
@@ -139,7 +139,7 @@ public slots:
         void appendLogDebug(const QString& text);
         void appendLogError(const QString& text);
         void startSynergy();
-		void retryStart(); // If the connection failed this will retry a startSynergy
+        void retryStart(); // If the connection failed this will retry a startSynergy
 
     protected slots:
         void sslToggled(bool enabled);
diff --git a/src/lib/platform/XWindowsUtil.cpp b/src/lib/platform/XWindowsUtil.cpp
index 59e26b52..cfef8cf4 100644
--- a/src/lib/platform/XWindowsUtil.cpp
+++ b/src/lib/platform/XWindowsUtil.cpp
@@ -1303,7 +1303,7 @@ XWindowsUtil::getWindowProperty(Display* display, Window window,
     int actualDatumSize;
 
     // ignore errors.  XGetWindowProperty() will report failure.
-    // XWindowsUtil::ErrorLock lock(display);
+    XWindowsUtil::ErrorLock lock(display);
 
     // read the property
     bool okay = true;