diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-05-07 14:37:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-05-07 13:53:54 +0000 |
| commit | 98e6a218800a35dac1b806a05caf80997cb85201 (patch) | |
| tree | ed9bee5c01fe83a99505773cc08f0c0c416386b0 /src | |
| parent | 7bdb29412cc002c7de595f56235fcf878d66fc7a (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp index 8a89ac30ad..d72db3c2a8 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; } |