Merge branch 'master' into chart-db
This commit is contained in:
commit
e3b109819e
@ -855,6 +855,7 @@ ag_chart_load_from_file(GFile *file, GError **err)
|
|||||||
house_system_enum_name = g_utf8_strdown(house_system_name, -1);
|
house_system_enum_name = g_utf8_strdown(house_system_name, -1);
|
||||||
g_free(house_system_name);
|
g_free(house_system_name);
|
||||||
house_system_class = g_type_class_ref(GSWE_TYPE_HOUSE_SYSTEM);
|
house_system_class = g_type_class_ref(GSWE_TYPE_HOUSE_SYSTEM);
|
||||||
|
|
||||||
if ((enum_value = g_enum_get_value_by_nick(
|
if ((enum_value = g_enum_get_value_by_nick(
|
||||||
G_ENUM_CLASS(house_system_class),
|
G_ENUM_CLASS(house_system_class),
|
||||||
house_system_enum_name
|
house_system_enum_name
|
||||||
|
@ -1483,7 +1483,7 @@ ag_window_set_chart(AgWindow *window, AgChart *chart)
|
|||||||
chart_changed,
|
chart_changed,
|
||||||
window
|
window
|
||||||
);
|
);
|
||||||
g_object_unref(priv->chart);
|
g_clear_object(&(priv->chart));
|
||||||
}
|
}
|
||||||
|
|
||||||
ag_db_save_data_free(priv->saved_data);
|
ag_db_save_data_free(priv->saved_data);
|
||||||
|
Loading…
Reference in New Issue
Block a user