[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: only initialize directRDP variable if platform is Linux.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit d69e58d31dbf0cfb8768105fbd4b8de0c7a9f0af
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jan 27 08:24:19 2018 +0100

    src/onmainwindow.cpp: only initialize directRDP variable if platform is Linux.
    
    Fixes compile failures on Windows and OS X.
---
 debian/changelog     | 2 ++
 src/onmainwindow.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f595175..ef42b11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
       connection startup.
     - src/onmainwindow.cpp: initialize directRDP to false to be able to call
       slotSuspendSessFromSt () even if no session has previously been started.
+    - src/onmainwindow.cpp: only initialize directRDP variable if platform is
+      Linux. Fixes compile failures on Windows and OS X.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.1.1):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 23aaefd..f3bfc74 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -140,7 +140,9 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     systemDisablePA=false;
 #endif /* defined (Q_OS_DARWIN) || defined (Q_OS_WIN) */
 
+#ifdef Q_OS_LINUX
     directRDP = false;
+#endif /* defined (Q_OS_LINUX) */
 
 // Try to determine the native DPI and use it for the default
     int dpix = QApplication::desktop()->physicalDpiX();

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git