diff options
| author | myheroyuki <myheroyuki@outlook.com> | 2023-09-07 15:05:26 +0300 |
|---|---|---|
| committer | myheroyuki <myheroyuki@outlook.com> | 2023-09-07 15:05:26 +0300 |
| commit | c0b2415fca7001e6fff411e24ffbf70948b7dc92 (patch) | |
| tree | 1729efc7cbde0d614490c317ae8be421bf2f9c22 /src | |
| parent | 2f328c72c00b58d57b8563202584f941bc3d5068 (diff) | |
Fix freeze that occurs when loading in python modules properly
Diffstat (limited to 'src')
| -rw-r--r-- | src/remmina_plugin_native.c | 3 | ||||
| -rw-r--r-- | src/remmina_ssh.c | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/remmina_plugin_native.c b/src/remmina_plugin_native.c index 7954b8df9..a5b9682e9 100644 --- a/src/remmina_plugin_native.c +++ b/src/remmina_plugin_native.c @@ -64,9 +64,8 @@ gboolean remmina_plugin_native_load(RemminaPluginService* service, const char* n RemminaPluginEntryFunc entry; //Python plugins cannot be lazy loaded, so hande their loading seperately - //TODO: Figure out how to properly load python plugins without breaking others if (strstr(name, "remmina-plugin-python_wrapper") != NULL ){ - module = g_module_open(name, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + module = g_module_open(name, 0); } else{ module = g_module_open(name, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); diff --git a/src/remmina_ssh.c b/src/remmina_ssh.c index d5c6f1115..ed204def6 100644 --- a/src/remmina_ssh.c +++ b/src/remmina_ssh.c @@ -2336,7 +2336,8 @@ remmina_ssh_tunnel_main_thread_proc(gpointer data) gint ret; struct sockaddr_in sin; - t1 = t2 = g_date_time_new_now_local(); + t1 = g_date_time_new_now_local(); + t2 = g_date_time_new_now_local(); switch (tunnel->tunnel_type) { case REMMINA_SSH_TUNNEL_OPEN: @@ -2464,10 +2465,8 @@ remmina_ssh_tunnel_main_thread_proc(gpointer data) REMMINA_DEBUG("Polling tunnel channels"); channel = ssh_channel_accept_forward(REMMINA_SSH(tunnel)->session, 0, &tunnel->port); if (channel == NULL) - t2 = t1; + t2 = g_date_time_new_now_local(); } - g_date_time_unref(t1); - g_date_time_unref(t2); } if (channel) { |