diff options
author | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-03-21 09:10:26 +0300 |
---|---|---|
committer | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-03-21 09:10:26 +0300 |
commit | e59e88df1005355b0bc2ac4adea987eaf7254eb6 (patch) | |
tree | 7b76fb62b51268cf775a40accb36d6c65e6d0a53 | |
parent | 68170e7c7e88fcc78d40ea628c5c1bed8b346017 (diff) | |
parent | 55e2324a1754d478433262cef504b3786faf2dae (diff) |
Merge branch 'master' into 'master'
Fix trial for 2577: Closing a VNC connection makes Remmina close all other...
See merge request Remmina/Remmina!2391
-rw-r--r-- | src/rcw.c | 4 | ||||
-rw-r--r-- | src/remmina_scrolled_viewport.c | 5 |
2 files changed, 9 insertions, 0 deletions
@@ -3398,6 +3398,10 @@ void rco_closewin(RemminaProtocolWidget *gp) } } if (cnnobj) { + if (REMMINA_IS_SCROLLED_VIEWPORT(cnnobj->scrolled_container)) { + REMMINA_DEBUG("deleting motion"); + remmina_scrolled_viewport_remove_motion(REMMINA_SCROLLED_VIEWPORT(cnnobj->scrolled_container)); + } cnnobj->remmina_file = NULL; g_free(cnnobj); gp->cnnobj = NULL; diff --git a/src/remmina_scrolled_viewport.c b/src/remmina_scrolled_viewport.c index 44056519d..f42ec99ec 100644 --- a/src/remmina_scrolled_viewport.c +++ b/src/remmina_scrolled_viewport.c @@ -38,6 +38,7 @@ #include "config.h" #include "remmina_scrolled_viewport.h" #include "remmina_pref.h" +#include "remmina_log.h" #include "remmina/remmina_trace_calls.h" G_DEFINE_TYPE( RemminaScrolledViewport, remmina_scrolled_viewport, GTK_TYPE_EVENT_BOX) @@ -156,6 +157,10 @@ static gboolean remmina_scrolled_viewport_leave(GtkWidget *widget, GdkEventCross { TRACE_CALL(__func__); RemminaScrolledViewport *gsv = REMMINA_SCROLLED_VIEWPORT(widget); + if (gsv->viewport_motion_handler) { + REMMINA_DEBUG("cleaning motion ..."); + remmina_scrolled_viewport_remove_motion(gsv); + } gsv->viewport_motion_handler = g_timeout_add(20, remmina_scrolled_viewport_motion_timeout, gsv); return FALSE; } |