From 98e6a218800a35dac1b806a05caf80997cb85201 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Tue, 7 May 2019 14:37:11 +0200
Subject: [PATCH] RemoteLinux: Fix crash on Windows

We must not access the X11ForwardingAspect unconditionally, as it only
exists on Linux hosts.

Fixes: QTCREATORBUG-22414
Change-Id: I205d55b5ec318e3a8cae8e27379f84cd6d459ee0
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
index 8a89ac30add..d72db3c2a8f 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
@@ -104,8 +104,8 @@ QString RemoteLinuxCustomRunConfiguration::runConfigDefaultDisplayName()
 Runnable RemoteLinuxCustomRunConfiguration::runnable() const
 {
     ProjectExplorer::Runnable r = RunConfiguration::runnable();
-    r.extraData.insert("Ssh.X11ForwardToDisplay",
-                       aspect<X11ForwardingAspect>()->display(macroExpander()));
+    if (const auto * const forwardingAspect = aspect<X11ForwardingAspect>())
+        r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display(macroExpander()));
     return r;
 }