Commit 2ce59b21 authored by Antenore Gatta's avatar Antenore Gatta

Merge branch 'fix_ar_crash' into 'master'

Fix crash when clicking AR-button

See merge request Remmina/Remmina!1918
parents 0c75bda6 f2958159
...@@ -31,6 +31,7 @@ Authors of Remmina Project ...@@ -31,6 +31,7 @@ Authors of Remmina Project
e-alfred <[email protected]> e-alfred <[email protected]>
Emmanuel Grognet <[email protected]> Emmanuel Grognet <[email protected]>
Eric Hoog <[email protected]> Eric Hoog <[email protected]>
Fabian Beu <[email protected]>
Fabian Rodriguez <[email protected]> Fabian Rodriguez <[email protected]>
Frank Bongrand <[email protected]> Frank Bongrand <[email protected]>
Frank Niessen <[email protected]> Frank Niessen <[email protected]>
......
...@@ -70,6 +70,7 @@ dupondje &lt;[email protected]&gt; ...@@ -70,6 +70,7 @@ dupondje &lt;[email protected]&gt;
e-alfred &lt;[email protected]&gt; e-alfred &lt;[email protected]&gt;
Emmanuel Grognet &lt;[email protected]&gt; Emmanuel Grognet &lt;[email protected]&gt;
Eric Hoog &lt;[email protected]&gt; Eric Hoog &lt;[email protected]&gt;
Fabian Beu &lt;[email protected]&gt;
Fabian Rodriguez &lt;[email protected]&gt; Fabian Rodriguez &lt;[email protected]&gt;
Frank Bongrand &lt;[email protected]&gt; Frank Bongrand &lt;[email protected]&gt;
Frank Niessen &lt;[email protected]&gt; Frank Niessen &lt;[email protected]&gt;
......
...@@ -367,10 +367,14 @@ static RemminaConnectionObject *rcw_get_visible_cnnobj(RemminaConnectionWindow * ...@@ -367,10 +367,14 @@ static RemminaConnectionObject *rcw_get_visible_cnnobj(RemminaConnectionWindow *
{ {
gint np; gint np;
np = gtk_notebook_get_current_page(GTK_NOTEBOOK(cnnwin->priv->notebook)); if (cnnwin != NULL && cnnwin->priv!=NULL && cnnwin->priv->notebook != NULL) {
if (np < 0) np = gtk_notebook_get_current_page(GTK_NOTEBOOK(cnnwin->priv->notebook));
return NULL; if (np < 0)
return rcw_get_cnnobj_at_page(cnnwin, np); return NULL;
return rcw_get_cnnobj_at_page(cnnwin, np);
}
else
return NULL;
} }
static RemminaScaleMode get_current_allowed_scale_mode(RemminaConnectionObject *cnnobj, gboolean *dynres_avail, gboolean *scale_avail) static RemminaScaleMode get_current_allowed_scale_mode(RemminaConnectionObject *cnnobj, gboolean *dynres_avail, gboolean *scale_avail)
...@@ -1383,7 +1387,7 @@ static void rcw_toolbar_scaler_option(GtkWidget *widget, RemminaConnectionWindow ...@@ -1383,7 +1387,7 @@ static void rcw_toolbar_scaler_option(GtkWidget *widget, RemminaConnectionWindow
group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem)); group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
if (!scaler_expand) if (!scaler_expand)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(rcw_scaler_keep_aspect), cnnobj); g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(rcw_scaler_keep_aspect), cnnwin);
menuitem = gtk_radio_menu_item_new_with_label(group, _("Fill client window when scaled")); menuitem = gtk_radio_menu_item_new_with_label(group, _("Fill client window when scaled"));
gtk_widget_show(menuitem); gtk_widget_show(menuitem);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment