You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.2 KiB
45 lines
1.2 KiB
commit bed49ad62d78718c0876c000a97c68cc87f12c7c
|
|
Author: Jean-Louis Dupond <jean-louis@dupond.be>
|
|
Date: Sat Sep 1 20:56:09 2012 +0200
|
|
|
|
Closes #77: Close the SSH tunnel after the connection has been closed
|
|
|
|
Index: FreeRDP-Remmina-356c033/remmina/src/remmina_protocol_widget.c
|
|
===================================================================
|
|
--- FreeRDP-Remmina-356c033.orig/remmina/src/remmina_protocol_widget.c
|
|
+++ FreeRDP-Remmina-356c033/remmina/src/remmina_protocol_widget.c
|
|
@@ -267,13 +267,7 @@ gboolean remmina_protocol_widget_close_c
|
|
gp->priv->chat_window = NULL;
|
|
}
|
|
|
|
-#ifdef HAVE_LIBSSH
|
|
- if (gp->priv->ssh_tunnel)
|
|
- {
|
|
- remmina_ssh_tunnel_free(gp->priv->ssh_tunnel);
|
|
- gp->priv->ssh_tunnel = NULL;
|
|
- }
|
|
-#endif
|
|
+ gboolean retval;
|
|
|
|
if (!gp->priv->plugin || !gp->priv->plugin->close_connection)
|
|
{
|
|
@@ -281,7 +275,17 @@ gboolean remmina_protocol_widget_close_c
|
|
return FALSE;
|
|
}
|
|
|
|
- return gp->priv->plugin->close_connection(gp);
|
|
+ retval = gp->priv->plugin->close_connection(gp);
|
|
+
|
|
+ #ifdef HAVE_LIBSSH
|
|
+ if (gp->priv->ssh_tunnel)
|
|
+ {
|
|
+ remmina_ssh_tunnel_free(gp->priv->ssh_tunnel);
|
|
+ gp->priv->ssh_tunnel = NULL;
|
|
+ }
|
|
+ #endif
|
|
+
|
|
+ return retval;
|
|
}
|
|
|
|
static gboolean remmina_protocol_widget_emit_signal_timeout(gpointer user_data)
|